Merge remote-tracking branch 'origin/master'

CM1/Makefile

@@ -7,7 +7,7 @@ all: ../tmp/CM1.html ../tmp/CM1_slides.html
 	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/CM1_slides.html: CM1.md 
-	pandoc --css slidy.css --template ../www/template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

CM2/Makefile

@@ -4,7 +4,7 @@ DOT_FILES = $(shell find . -name "*.dot")
 SVG_FILES = $(DOT_FILES:.dot=.svg)
 
 all: $(SVG_FILES) ../tmp/CM2.html ../tmp/CM2_slides.html 
-	cp *.png ../tmp
+	cp *.svg *.png ../tmp
 
 %.svg: %.dot
 	dot -Tsvg -o $@ $<
@@ -13,7 +13,7 @@ all: $(SVG_FILES) ../tmp/CM2.html ../tmp/CM2_slides.html
 	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/CM2_slides.html: CM2.md ../tmp/before.html 
-	pandoc --css slidy.css --template ../www/template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 	rm -rf $(SVG_FILES)

CM3/Makefile

@@ -6,7 +6,7 @@ all: ../tmp/CM3.html ../tmp/CM3_slides.html
 	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/CM3_slides.html: CM3.md 
-	pandoc --css slidy.css --template ../www/template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

www/Makefile

@@ -11,7 +11,7 @@ all: ../tmp/before.html ../tmp/index.html ../tmp/index_slides.html
 	pandoc --template template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/index_slides.html: index.md 
-	pandoc --css slidy.css --template template_slidy.html --toc --toc-depth 1 -t slidy -s -o $@ $<
+	pandoc --template template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<
 
 clean:
 

www/template_slidy.html

@@ -19,8 +19,6 @@ $if(highlighting-css)$
 $highlighting-css$
   </style>
 $endif$
-  <link rel="stylesheet" type="text/css" media="screen, projection, print"
-    href="$slidy-url$/styles/slidy.css" />
 $for(css)$
   <link rel="stylesheet" type="text/css" media="screen, projection, print"
    href="$css$" />
@@ -33,6 +31,8 @@ $for(header-includes)$
 $endfor$
 
 <!-- <script src="$slidy-url$/scripts/slidy.js" -->
+  <link rel="stylesheet" type="text/css" media="screen, projection, print"
+   href="slidy.css" />
   <script src="slidy.js"
     charset="utf-8" type="text/javascript"></script>
 $if(duration)$