Merge branch 'master' into oskar

Author: Oskar Lundström

Bear_test/ideer.txt

@@ -3,10 +3,12 @@ Vektorer:
     flygande fåglar (vind, flaxfrekvens, resultant)
 
     Mekanik som lådor o krafter
-
+        utöka befintligt krafter_på_lådor till svt
+        
 Calculus:
     Integrering o deriveringar:
         medelhastigher, sträcka över tid
+            (inge intergraler atm)
 
 
 rnd:

Bear_test/krafter_pa_lador.lhs

@@ -96,7 +96,6 @@ $ enh_vekt (V2 0 0)
 Jag skulle anta att enh_vekt bara gäller då (magnitude v) =/= 0.
 
 
--- Fixed nollvektorn.
 
 
 *Main> fru fg (pi/4) 0
@@ -154,14 +153,36 @@ fru'
 (7.500000000000001 x, -4.330127018922193 y
 
 
-
-wtf händer? Hur kan fr ha samma x-vektor för två olika vinklar inom samma kvadrant?
-
 fn
 
 *Main> fn fg (pi/3)
 (-4.330127018922194 x, -2.500000000000001 y)
 *Main> fn fg (pi/6)
 (-4.330127018922193 x, -7.500000000000001 y)
 
+-------------------------------- SVT ------------------------------------
+
+Hur mycket bromsar friktionen?
+Med F = m N
+
+2.
+F = ma
+
+3.
+x = v0 * t + a * t^2 / 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

Book/.gitignore

@@ -0,0 +1,2 @@
+# Ignore the built files
+build/

Book/Makefile

@@ -0,0 +1,3 @@
+
+run :
+	python3 build.py

Book/build.py

@@ -7,6 +7,7 @@
 
 import os
 import shutil
+from urllib.parse import quote
 from subprocess import Popen, PIPE
 
 def read_file(filepath):
@@ -54,7 +55,7 @@ def build_sections(sources):
         next_chap_name = "Table of contents"
         if (i + 1) < len(chapters):
             next_section, next_chap_name, _ = chapters[i + 1]
-            next_chap_href = "../{}/{}.html".format(next_section, next_chap_name)
+            next_chap_href = "../{}/{}.html".format(quote(next_section, safe=''), quote(next_chap_name, safe=''))
         if not os.path.exists(section):
             os.makedirs(section)
         chapter_path = "../../" + chapter_source
@@ -75,10 +76,11 @@ def build_sections(sources):
                 "lhs-source-href": lhs_source_href,
                 "lhs-source-name": lhs_source_name,
             })
-        out_path = "{}/{}.html".format(section, chapter_name)
+        out_path   = "{}/{}.html".format(section, chapter_name)
+        out_path_u = "{}/{}.html".format(quote(section, safe=''), quote(chapter_name, safe=''))
         write_string_to_file(chapter, out_path)
         copy_images(os.path.dirname(chapter_path), section)
-        prev_chap_href = "../" + out_path
+        prev_chap_href = "../" + out_path_u
         prev_chap_name = chapter_name
 
 def build_index(sources):
@@ -88,7 +90,7 @@ def build_index(sources):
         toc += "<div>" + section_name + "</div>\n"
         toc += "<ul>\n"
         for (chapter_name, _) in chapter_sources:
-            chapter_path = "{}/{}.html".format(section_name, chapter_name)
+            chapter_path = "{}/{}.html".format(quote(section_name, safe=''), quote(chapter_name, safe=''))
             toc += "<li><a href=\"{}\">{}</a></li>\n".format(chapter_path, chapter_name)
         toc += "</ul>\n</li>\n"
     index_template = open_template("index")
@@ -97,17 +99,20 @@ def build_index(sources):
 
 sources = [
     ("Introduction", [
-        ("Introduction'", "Physics/src/Introduction/Introduction.lhs"),
+        ("About this book", "Physics/src/Introduction/About.lhs"),
+        ("So what's a DSL?", "Physics/src/Introduction/WhatIsADsl.lhs"),
+        ("Getting started", "Physics/src/Introduction/GettingStarted.lhs"),
     ]),
     ("Calculus", [
         ("Introduction", "Physics/src/Calculus/Intro.lhs"),
         ("Function expressions", "Physics/src/Calculus/FunExpr.lhs"),
         ("Differential calculus", "Physics/src/Calculus/DifferentialCalc.lhs"),
         ("Integral calculus", "Physics/src/Calculus/IntegralCalc.lhs"),
-        ("Visualization", "Physics/src/Calculus/VisVerApp.lhs"),
+        ("Plotting graphs", "Physics/src/Calculus/VisVerApp.lhs"),
+        ("Syntax trees", "Physics/src/Calculus/SyntaxTree.lhs"),
     ]),
-    ("Vectors", [
-        ("Vector", "Physics/src/Vector/Vector.lhs")
+    ("Linear algebra", [
+        ("Vectors", "Physics/src/Vector/Vector.lhs")
     ]),
     ("Dimensions", [
         ("Introduction", "Physics/src/Dimensions/Intro.lhs"),
@@ -116,16 +121,17 @@ def build_index(sources):
         "Physics/src/Dimensions/ValueLevel/Test.lhs"),
         ("Type-level dimensions", "Physics/src/Dimensions/TypeLevel.lhs"),
         ("Quantities", "Physics/src/Dimensions/Quantity.lhs"),
-        ("Testing of Quantity",
+        ("Testing of Quantities",
         "Physics/src/Dimensions/Quantity/Test.lhs"),
         ("Usage", "Physics/src/Dimensions/Usage.lhs"),
     ]),
+    ("Newtonian Mechanics", [
+        ("Single particle mechanics", "Physics/src/NewtonianMechanics/SingleParticle.lhs")
+    ]),
     ("Examples", [
-        ("Gungbräda", "Physics/src/Examples/Gungbraeda.lhs"),
-        ("krafter på lådor", "Physics/src/Examples/krafter_pa_lador.lhs"),
-
+        ("Teeter", "Physics/src/Examples/Teeter.lhs"),
+        ("Box on an incline", "Physics/src/Examples/Box_incline.lhs"),
     ])
-
 ]
 
 if not os.path.exists("build"):

Book/chapter.template

@@ -31,7 +31,7 @@
         <a href="../index.html">Table of contents</a>
         <span>Next: <a href="{next-href}">{next-name}</a></span>
       </nav>
-      © Kandidatboisen (2018), GPL
+      © Björn Werner, Erik Sjöström, Johan Johansson, Oskar Lundström (2018), GPL
     </footer>
   </body>
 </html>

Book/includes/type.html

@@ -20,7 +20,7 @@
     </main>
 
     <footer>
-      © Kandidatboisen (2018), GPL
+      © Björn Werner, Erik Sjöström, Johan Johansson, Oskar Lundström (2018), GPL
     </footer>
   </body>
 </html>

Book/index.template

@@ -86,6 +86,12 @@ div#toc ol > li > ul {
     border-radius: 5px;
 }
 
+.center-img {
+    display: block;
+    border: 3px solid #F0F0F0;
+    border-radius: 5px;
+}
+
 .float-img-left, .float-img-right {
     width: 35%;
 }