modif makefile

CM1/Makefile

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

CM2/Makefile

@@ -10,7 +10,7 @@ all: $(SVG_FILES) ../tmp/CM2.html ../tmp/CM2_slides.html
 	dot -Tsvg -o $@ $<
 
 ../tmp/CM2.html: CM2.md ../tmp/before.html 
-	pandoc --template ../www/template.html --css template.css --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
+	pandoc --template ../www/template.html --toc --toc-depth 1 --include-before ../tmp/before.html -s -o $@ $<
 
 ../tmp/CM2_slides.html: CM2.md ../tmp/before.html 
 	pandoc --template ../www/template_slidy.html --toc-depth 1 -t slidy -s -o $@ $<

CM3/Makefile

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

www/Makefile

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

www/before.md

@@ -1,8 +1,9 @@
 - [Présentation](index.html) 
-- [Présentation (slides)](index_slides.html)
 - [CM1](CM1.html) 
-- [CM1 (slides)](CM1_slides.html)
 - [CM2](CM2.html) 
-- [CM2 (slides)](CM2_slides.html)
 - [CM3](CM3.html) 
+- \ 
+- [Présentation (slides)](index_slides.html)
+- [CM1 (slides)](CM1_slides.html)
+- [CM2 (slides)](CM2_slides.html)
 - [CM3 (slides)](CM3_slides.html)

www/template.html

@@ -23,6 +23,7 @@ $endif$
 $for(css)$
   <link rel="stylesheet" href="$css$" $if(html5)$$else$type="text/css" $endif$/>
 $endfor$
+  <link rel="stylesheet" href="template.css" $if(html5)$$else$type="text/css" $endif$/>
 $if(math)$
   $math$
 $endif$