From 95c83a2ba1ecc55405fe970f7c7362a5cbf6d0b0 Mon Sep 17 00:00:00 2001
From: Orestis Malaspinas <orestis.malaspinas@hesge.ch>
Date: Tue, 19 Jun 2018 13:29:33 +0200
Subject: [PATCH] modified makefile to have all options in it instead of md for
compatibility
---
Makefile | 17 ++++++++++++-----
intro.md | 6 ++----
types.md | 12 ++++--------
variables.md | 12 ++++--------
4 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/Makefile b/Makefile
index 8812056..9a2da6f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,17 +14,24 @@ REVEALOPRIONS = -t revealjs
REVEALOPRIONS += --template ./default.revealjs
# REVEALOPRIONS += -V theme=moon
REVEALOPRIONS += -V center=true
-REVEALOPRIONS += -V margin=0
-REVEALOPRIONS += -V minScale=0.2
-REVEALOPRIONS += -V maxScale=2.0
-# REVEALOPRIONS += -V width="1920" -V height="1080" -V margin=0 -V center=false
+# REVEALOPRIONS += -V margin=0
+# REVEALOPRIONS += -V minScale=0.2
+# REVEALOPRIONS += -V maxScale=2.0
+REVEALOPRIONS += -V width="1500" -V height="1500" -V margin=0 -V center=false
+REVEALOPRIONS += -V include-after="<script src="js/playRust.js"></script> \
+ <script src="js/remote-code.js"></script> \
+ <script src="js/remote-diagrams.js"></script> \
+ <script src="js/em-artiste.js"></script>"
+REVEALOPRIONS += -V header-includes="<link rel="stylesheet" href="reveal.js/lib/css/zenburn.css" >\
+ <link rel="stylesheet" href="reveal.js/css/theme/simple.css" id="theme">\
+ <link rel="stylesheet" href="css/console.css" id="theme">\
+ <script src="jquery/dist/jquery.min.js"></script>"
REVEALOPRIONS += --section-divs
# REVEALOPRIONS += -V fontsize=tiny
REVEALOPRIONS += -V slideNumber=true
REVEALOPRIONS += --slide-level=1
# REVEALOPRIONS += --highlight-style espresso
REVEALOPRIONS += --self-contained
-# REVEALOPRIONS += --include-in-header=reveal.js/left_just.css
SVG=$(wildcard figs/*.svg)
PNG=$(SVG:%.svg=%.png)
diff --git a/intro.md b/intro.md
index 2d32431..c235d5e 100644
--- a/intro.md
+++ b/intro.md
@@ -14,10 +14,8 @@ include-after:
<script src="js/remote-code.js"></script>
<script src="js/remote-diagrams.js"></script>
<script src="js/em-artiste.js"></script>
-width:
- 1500
-height:
- 1500
+pdfMaxPagesPerSlide:
+ 1
<!-- slide-numbers: true -->
---
diff --git a/types.md b/types.md
index b4345e7..ef29057 100644
--- a/types.md
+++ b/types.md
@@ -4,25 +4,21 @@ subtitle: Types
author: Orestis Malaspinas
<!-- date: 25 avril 2018 -->
sansfont: Sans Serif
-header-includes:
+<!-- header-includes:
<link rel="stylesheet" href="reveal.js/lib/css/zenburn.css" >
<link rel="stylesheet" href="reveal.js/css/theme/simple.css" id="theme">
<link rel="stylesheet" href="css/console.css" id="theme">
- <script src="jquery/dist/jquery.min.js"></script>
+ <script src="jquery/dist/jquery.min.js"></script> -->
<!-- <script src="reveal.js/lib/js/classList.js"></script> -->
<!-- <script src="reveal.js/plugin/zoom-js/zoom.js"></script> -->
<!-- <script src="reveal.js/plugin/highlight/highlight.js"></script> -->
<!-- <script src="js/remote-diagrams.js"></script> -->
<!-- <script src="reveal.js/plugin/notes/notes.js"></script> -->
-include-after:
+<!-- include-after:
<script src="js/playRust.js"></script>
<script src="js/remote-code.js"></script>
<script src="js/remote-diagrams.js"></script>
- <script src="js/em-artiste.js"></script>
-width:
- 1500
-height:
- 1500
+ <script src="js/em-artiste.js"></script> -->
<!-- slide-numbers: true -->
---
diff --git a/variables.md b/variables.md
index 1319d73..16a4220 100644
--- a/variables.md
+++ b/variables.md
@@ -4,25 +4,21 @@ subtitle: Variables
author: Orestis Malaspinas
<!-- date: 25 avril 2018 -->
sansfont: Sans Serif
-header-includes:
+<!-- header-includes:
<link rel="stylesheet" href="reveal.js/lib/css/zenburn.css" >
<link rel="stylesheet" href="reveal.js/css/theme/simple.css" id="theme">
<link rel="stylesheet" href="css/console.css" id="theme">
- <script src="jquery/dist/jquery.min.js"></script>
+ <script src="jquery/dist/jquery.min.js"></script> -->
<!-- <script src="reveal.js/lib/js/classList.js"></script> -->
<!-- <script src="reveal.js/plugin/zoom-js/zoom.js"></script> -->
<!-- <script src="reveal.js/plugin/highlight/highlight.js"></script> -->
<!-- <script src="js/remote-diagrams.js"></script> -->
<!-- <script src="reveal.js/plugin/notes/notes.js"></script> -->
-include-after:
+<!-- include-after:
<script src="js/playRust.js"></script>
<script src="js/remote-code.js"></script>
<script src="js/remote-diagrams.js"></script>
- <script src="js/em-artiste.js"></script>
-width:
- 1500
-height:
- 1500
+ <script src="js/em-artiste.js"></script> -->
<!-- slide-numbers: true -->
---
--
GitLab