Huge merge commit, hope there's no trouble...

Author: erikdsjostrom

Book/build.py

@@ -7,7 +7,7 @@
 
 import os
 import shutil
-import subprocess
+from subprocess import Popen, PIPE
 
 def read_file(filepath):
     with open(filepath, "r") as f:
@@ -27,12 +27,12 @@ def write_string_to_file(s, filepath):
         f.write(s)
 
 def render_lhs(lhs_filepath):
-    return subprocess.check_output([
-        "pandoc", lhs_filepath,
-                  "-f", "markdown+lhs",
-                  "-t", "html",
-                  "--mathjax"
-    ]).decode("utf8")
+    cmd = ["pandoc", lhs_filepath, "-f", "markdown+lhs", "-t", "html", "--mathjax"]
+    p = Popen(cmd, stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    if stderr != b"":
+        print("file: {}, stderr: {}".format(lhs_filepath, stderr))
+    return stdout.decode("utf8")
 
 def has_image_ext(filename):
     _, ext = os.path.splitext(filename)
@@ -58,15 +58,22 @@ def build_sections(sources):
         if not os.path.exists(section):
             os.makedirs(section)
         chapter_path = "../../" + chapter_source
+        lhs_source_href = "https://github.com/DSLsofMath/BScProj2018/blob/master/{}".format(chapter_source)
+        prefix = "Physics/src/"
+        lhs_source_name = chapter_source[len(prefix):] if chapter_source.startswith(prefix) else chapter_source
         content = render_lhs(chapter_path)
         chapter = apply_template(
             chapter_templ,
             {
+                "section-name": section,
+                "chapter-name": chapter_name,
                 "content": content,
                 "previous-href": prev_chap_href,
                 "previous-name": prev_chap_name,
                 "next-href": next_chap_href,
                 "next-name": next_chap_name,
+                "lhs-source-href": lhs_source_href,
+                "lhs-source-name": lhs_source_name,
             })
         out_path = "{}/{}.html".format(section, chapter_name)
         write_string_to_file(chapter, out_path)
@@ -89,6 +96,9 @@ def build_index(sources):
     write_string_to_file(index, "index.html")
 
 sources = [
+    ("Introduction", [
+        ("Introduction'", "Physics/src/Introduction/Introduction.lhs"),
+    ]),
     ("Dimensions", [
         ("Introduction", "Physics/src/Dimensions/Intro.lhs"),
         ("Value-level dimensions", "Physics/src/Dimensions/ValueLevel.lhs"),
@@ -104,8 +114,11 @@ def build_index(sources):
         ("Vector", "Physics/src/Vector/Vector.lhs")
     ]),
     ("Calculus", [
-        ("Calculus", "Physics/src/Calculus/Calculus.lhs"),
-        ("Syntax Tree", "Physics/src/Calculus/SyntaxTree.lhs"),
+        ("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, Verification, and Application", "Physics/src/Calculus/VisVerApp.lhs"),
     ]),
     ("Newtonian Mechanics", [
         ("Single particle mechanics", "Physics/src/NewtonianMechanics/SingleParticle.lhs")

Book/chapter.template

@@ -11,7 +11,9 @@
     <header>
       <a href="../index.html"><h1>Learn You a <span class="physics">Physics</span> for Great Good!</h1></a>
       <h1>&gt;&gt;&gt; WORK IN PROGRESS &lt;&lt;&lt;</h1>
+      <h2>{section-name} / {chapter-name}</h2>
       <nav>
+	<span>[src: <a href="{lhs-source-href}">{lhs-source-name}</a>]</span>
         <span>Previous: <a href="{previous-href}">{previous-name}</a></span>
         <a href="../index.html">Table of contents</a>
         <span>Next: <a href="{next-href}">{next-name}</a></span>
@@ -24,11 +26,12 @@
 
     <footer>
       <nav>
+	<span>[src: <a href="{lhs-source-href}">{lhs-source-name}</a>]</span>
         <span>Previous: <a href="{previous-href}">{previous-name}</a></span>
         <a href="../index.html">Table of contents</a>
         <span>Next: <a href="{next-href}">{next-name}</a></span>
       </nav>
-      Licensed under the GPL by the Kandidatboisen (2018)
+      © Kandidatboisen (2018), GPL
     </footer>
   </body>
 </html>

Book/index.template

@@ -14,11 +14,13 @@
     </header>
 
     <main>
-      {toc}
+      <div id="toc">
+	{toc}
+      </div>
     </main>
 
     <footer>
-      Licensed under the GPL by the Kandidatboisen (2018)
+      © Kandidatboisen (2018), GPL
     </footer>
   </body>
 </html>