Skip to content

Commit 8be9adc

Browse files
committed
new release 6.0
1 parent 07e1705 commit 8be9adc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1884
-724
lines changed

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ FROM ubuntu
22
MAINTAINER Adolfo Sanz De Diego [email protected]
33
ENV VERSION 0.0.2
44
# Software dependencies
5+
ARG DEBIAN_FRONTEND=noninteractive
56
RUN apt-get update && \
6-
apt-get -y install pandoc wget unzip npm chromium-browser \
7+
apt-get -y install wget unzip npm chromium-browser \
78
texlive-latex-base texlive-fonts-recommended texlive-latex-extra && \
89
npm install -g decktape
910
WORKDIR /home/
10-
RUN wget https://github.com/asanzdiego/markdownslides/archive/master.zip && \
11-
unzip master.zip
11+
RUN wget https://github.com/jgm/pandoc/releases/download/2.9.2/pandoc-2.9.2-1-amd64.deb && \
12+
dpkg -i pandoc-2.9.2-1-amd64.deb
13+
RUN wget https://github.com/asanzdiego/markdownslides/archive/6.0.zip && \
14+
unzip 6.0.zip
1215
WORKDIR /home/markdownslides-master
1316
ADD . /home/markdownslides-master

build.sh

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ function downloadLib() {
8787

8888
function downloadLibs() {
8989

90-
downloadLib https://github.com/hakimel/reveal.js/archive/3.8.0.zip \
91-
reveal.js-3.8.0 reveal.js
90+
downloadLib https://github.com/hakimel/reveal.js/archive/3.9.2.zip \
91+
reveal.js-3.9.2 reveal.js
9292
downloadLib https://github.com/denehyg/reveal.js-menu/archive/1.2.0.zip \
9393
reveal.js-menu-1.2.0 reveal.js-menu
9494
downloadLib https://github.com/e-gor/Reveal.js-Title-Footer/archive/master.zip \
@@ -187,11 +187,23 @@ function replaceNotes() {
187187
local TYPE="$2"
188188
local PLUS="$3"
189189

190-
# replace @start-notes with <aside class="notes">
191-
sed -i 's/^@start-notes/<aside class="notes">/g' "../export/$NAME$TYPE$PLUS.md"
190+
if [ "$TYPE" == "-slides" ]; then
191+
192+
# replace @start-notes with ::: notes
193+
sed -i 's/^@start-notes/::: notes/g' "../export/$NAME$TYPE$PLUS.md"
194+
195+
# replace @end-notes with :::
196+
sed -i 's/^@end-notes/:::/g' "../export/$NAME$TYPE$PLUS.md"
197+
198+
else
199+
200+
# replace @start-notes with <aside class="notes">
201+
sed -i 's/^@start-notes/<aside class="notes">/g' "../export/$NAME$TYPE$PLUS.md"
202+
203+
# replace @end-notes with </aside>
204+
sed -i 's/^@end-notes/<\/aside>/g' "../export/$NAME$TYPE$PLUS.md"
205+
fi
192206

193-
# replace @end-notes with </aside>
194-
sed -i 's/^@end-notes/<\/aside>/g' "../export/$NAME$TYPE$PLUS.md"
195207
}
196208

197209
function cleanMdToSlides() {
@@ -309,7 +321,7 @@ function buildRevealSlides() {
309321
--variable "transition=$REVEAL_JS_TRANSITION" \
310322
--variable "minScale=$REVEAL_JS_MIN_SCALE" \
311323
--variable "maxScale=$REVEAL_JS_MAX_SCALE" \
312-
"$NUMBERS" -o "../export/$NAME-slides$PDF$PLUS.html" "../export/$NAME-slides$PLUS.md"
324+
"$NUMBERS" --mathjax -o "../export/$NAME-slides$PDF$PLUS.html" "../export/$NAME-slides$PLUS.md"
313325

314326
sed -i s/h1\>/h2\>/g "../export/$NAME-slides$PDF$PLUS.html"
315327
sed -i s/\>\<h2/\>\<h1/g "../export/$NAME-slides$PDF$PLUS.html"
@@ -340,7 +352,7 @@ function buildPowerPointSlides() {
340352
info "Exporting... ../export/$NAME-slides$PLUS.pptx"
341353

342354
pandoc -w pptx \
343-
"$NUMBERS" -o "../export/$NAME-slides$PLUS.pptx" "../export/$NAME-slides$PLUS.md"
355+
"$NUMBERS" --mathjax -o "../export/$NAME-slides$PLUS.pptx" "../export/$NAME-slides$PLUS.md"
344356
}
345357

346358
function buildHtmlBook() {
@@ -352,7 +364,7 @@ function buildHtmlBook() {
352364

353365
pandoc -w html5 --template "$ORIGIN/templates/html-book-template.html" \
354366
--table-of-contents --top-level-division=chapter --highlight-style=tango \
355-
"$NUMBERS" -o "../export/$NAME-book$PLUS.html" "../export/$NAME-book$PLUS.md"
367+
"$NUMBERS" --mathjax -o "../export/$NAME-book$PLUS.html" "../export/$NAME-book$PLUS.md"
356368
}
357369

358370
function buildDocxBook() {
@@ -363,7 +375,7 @@ function buildDocxBook() {
363375
info "Exporting... ../export/$NAME-book$PLUS.docx"
364376

365377
pandoc -w docx --table-of-contents --top-level-division=chapter \
366-
"$NUMBERS" -o "../export/$NAME-book$PLUS.docx" "../export/$NAME-book$PLUS.md"
378+
"$NUMBERS" --mathjax -o "../export/$NAME-book$PLUS.docx" "../export/$NAME-book$PLUS.md"
367379
}
368380

369381
function buildEpubBook() {
@@ -374,7 +386,7 @@ function buildEpubBook() {
374386
info "Exporting... ../export/$NAME-book$PLUS.epub"
375387

376388
pandoc -w epub --table-of-contents --top-level-division=chapter \
377-
"$NUMBERS" -o "../export/$NAME-book$PLUS.epub" "../export/$NAME-book$PLUS.md"
389+
"$NUMBERS" --mathjax -o "../export/$NAME-book$PLUS.epub" "../export/$NAME-book$PLUS.md"
378390
}
379391

380392
function buildPdfBook() {
@@ -386,7 +398,7 @@ function buildPdfBook() {
386398

387399
sed '/.gif/d' "../export/$NAME-book$PLUS.md" | pandoc \
388400
--table-of-contents --top-level-division=chapter \
389-
"$NUMBERS" -o "../export/$NAME-book$PLUS.pdf"
401+
"$NUMBERS" --mathjax -o "../export/$NAME-book$PLUS.pdf"
390402
}
391403

392404
function build() {

doc/export/leeme-book-plus.docx

55 Bytes
Binary file not shown.

doc/export/leeme-book-plus.epub

84 Bytes
Binary file not shown.

doc/export/leeme-book-plus.html

Lines changed: 101 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
33
<head>
4-
<meta charset="utf-8">
5-
<meta name="generator" content="pandoc">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
4+
<meta charset="utf-8" />
5+
<meta name="generator" content="pandoc" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
77
<meta name="description" content="Markdown Slides [ES]">
8-
<meta name="author" content="Adolfo Sanz De Diego">
8+
<meta name="author" content="Adolfo Sanz De Diego" />
99
<title>Markdown Slides [ES]</title>
1010
<style type="text/css">
1111
pre > code.sourceCode { white-space: pre; position: relative; }
@@ -83,17 +83,87 @@
8383
margin: 0 auto;
8484
}
8585
</style>
86+
<style>
87+
code{white-space: pre-wrap;}
88+
span.smallcaps{font-variant: small-caps;}
89+
span.underline{text-decoration: underline;}
90+
div.column{display: inline-block; vertical-align: top; width: 50%;}
91+
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
92+
ul.task-list{list-style: none;}
93+
pre > code.sourceCode { white-space: pre; position: relative; }
94+
pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
95+
pre > code.sourceCode > span:empty { height: 1.2em; }
96+
code.sourceCode > span { color: inherit; text-decoration: inherit; }
97+
div.sourceCode { margin: 1em 0; }
98+
pre.sourceCode { margin: 0; }
99+
@media screen {
100+
div.sourceCode { overflow: auto; }
101+
}
102+
@media print {
103+
pre > code.sourceCode { white-space: pre-wrap; }
104+
pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
105+
}
106+
pre.numberSource code
107+
{ counter-reset: source-line 0; }
108+
pre.numberSource code > span
109+
{ position: relative; left: -4em; counter-increment: source-line; }
110+
pre.numberSource code > span > a:first-child::before
111+
{ content: counter(source-line);
112+
position: relative; left: -1em; text-align: right; vertical-align: baseline;
113+
border: none; display: inline-block;
114+
-webkit-touch-callout: none; -webkit-user-select: none;
115+
-khtml-user-select: none; -moz-user-select: none;
116+
-ms-user-select: none; user-select: none;
117+
padding: 0 4px; width: 4em;
118+
color: #aaaaaa;
119+
}
120+
pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa; padding-left: 4px; }
121+
div.sourceCode
122+
{ background-color: #f8f8f8; }
123+
@media screen {
124+
pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }
125+
}
126+
code span.al { color: #ef2929; } /* Alert */
127+
code span.an { color: #8f5902; font-weight: bold; font-style: italic; } /* Annotation */
128+
code span.at { color: #c4a000; } /* Attribute */
129+
code span.bn { color: #0000cf; } /* BaseN */
130+
code span.cf { color: #204a87; font-weight: bold; } /* ControlFlow */
131+
code span.ch { color: #4e9a06; } /* Char */
132+
code span.cn { color: #000000; } /* Constant */
133+
code span.co { color: #8f5902; font-style: italic; } /* Comment */
134+
code span.cv { color: #8f5902; font-weight: bold; font-style: italic; } /* CommentVar */
135+
code span.do { color: #8f5902; font-weight: bold; font-style: italic; } /* Documentation */
136+
code span.dt { color: #204a87; } /* DataType */
137+
code span.dv { color: #0000cf; } /* DecVal */
138+
code span.er { color: #a40000; font-weight: bold; } /* Error */
139+
code span.ex { } /* Extension */
140+
code span.fl { color: #0000cf; } /* Float */
141+
code span.fu { color: #000000; } /* Function */
142+
code span.im { } /* Import */
143+
code span.in { color: #8f5902; font-weight: bold; font-style: italic; } /* Information */
144+
code span.kw { color: #204a87; font-weight: bold; } /* Keyword */
145+
code span.op { color: #ce5c00; font-weight: bold; } /* Operator */
146+
code span.ot { color: #8f5902; } /* Other */
147+
code span.pp { color: #8f5902; font-style: italic; } /* Preprocessor */
148+
code span.sc { color: #000000; } /* SpecialChar */
149+
code span.ss { color: #4e9a06; } /* SpecialString */
150+
code span.st { color: #4e9a06; } /* String */
151+
code span.va { color: #000000; } /* Variable */
152+
code span.vs { color: #4e9a06; } /* VerbatimString */
153+
code span.wa { color: #8f5902; font-weight: bold; font-style: italic; } /* Warning */
154+
</style>
155+
<script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js" type="text/javascript"></script>
86156
<!--[if lt IE 9]>
87157
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
88158
<![endif]-->
89159
</head>
90160
<body>
91-
<header>
161+
<header id="title-block-header">
92162
<h1 class="title">Markdown Slides [ES]</h1>
93163
<p class="author">Adolfo Sanz De Diego</p>
94164
<p class="date"><span class="citation" data-cites="asanzdiego">@asanzdiego</span></p>
95165
</header>
96-
<nav id="TOC">
166+
<nav id="TOC" role="doc-toc">
97167
<ul>
98168
<li><a href="#acerca-de">Acerca de</a>
99169
<ul>
@@ -133,6 +203,7 @@ <h1 class="title">Markdown Slides [ES]</h1>
133203
<li><a href="#versión-3.0">Versión 3.0</a></li>
134204
<li><a href="#versión-4.0">Versión 4.0</a></li>
135205
<li><a href="#versión-5.0">Versión 5.0</a></li>
206+
<li><a href="#versión-6.0">Versión 6.0</a></li>
136207
</ul></li>
137208
<li><a href="#adolfo-sanz-de-diego-autor"><img src="../img/asanzdiego.png" style="box-shadow:none;vertical-align:middle;width:100px;" alt="Adolfo Sanz De Diego" /> Autor</a>
138209
<ul>
@@ -179,10 +250,18 @@ <h2 id="colaboradores">Colaboradores</h2>
179250
<li>Marcos Chavarría: <a href="https://twitter.com/chavarria1991" class="uri">https://twitter.com/chavarria1991</a></li>
180251
</ul>
181252
<h2 id="licencia">Licencia</h2>
182-
<ul>
183-
<li><strong>Este obra está bajo una licencia:</strong> - <a href="http://creativecommons.org/licenses/by-sa/3.0/es/">Creative Commons Reconocimiento-CompartirIgual 3.0</a></li>
184-
<li><strong>El código fuente de los programas están bajo una licencia:</strong> - <a href="http://www.viti.es/gnu/licenses/gpl.html">GPL 3.0</a></li>
253+
<div class="incremental">
254+
<ul class="incremental">
255+
<li><strong>Este obra está bajo una licencia:</strong>
256+
<ul class="incremental">
257+
<li><a href="http://creativecommons.org/licenses/by-sa/3.0/es/">Creative Commons Reconocimiento-CompartirIgual 3.0</a></li>
258+
</ul></li>
259+
<li><strong>El código fuente de los programas están bajo una licencia:</strong>
260+
<ul class="incremental">
261+
<li><a href="http://www.viti.es/gnu/licenses/gpl.html">GPL 3.0</a></li>
262+
</ul></li>
185263
</ul>
264+
</div>
186265
<h1 id="instalación">Instalación</h1>
187266
<h2 id="dependencias">Dependencias</h2>
188267
<ul>
@@ -253,17 +332,16 @@ <h2 id="imports">Imports</h2>
253332
- Line 3 of import-2.md
254333
- Line 4 of import-2.md</code></pre>
255334
<p>Cuarto ejemplo:</p>
256-
<pre><code></code></pre>
257-
<p><span class="citation" data-cites="import">@import</span> import/import-1.md startLine=2 endLine=3 showNumberLines ~~~ ~~~</p>
335+
<pre><code> @import import/import-1.md startLine=2 endLine=3 showNumberLines</code></pre>
258336
<pre><code>2 - Line 2 of import-1.md
259337
3 - Line 3 of import-1.md</code></pre>
260338
<h2 id="notas">Notas</h2>
261339
<ul>
262340
<li>Puedes añadir notas que serán visibles en modo libro o si <strong>pulsas la letra ‘s’ en las slides</strong> mediante <strong><span class="citation" data-cites="start-notes">@start-notes</span></strong> y <strong><span class="citation" data-cites="end-notes">@end-notes</span></strong>.</li>
263341
</ul>
264-
<pre><code>&lt;aside class=&quot;notes&quot;&gt;
265-
Esto solo es visible en modo libro o si pulsas &#39;s&#39; en las slides.
266-
&lt;/aside&gt; </code></pre>
342+
<pre><code> @start-notes
343+
Esto solo es visible en modo libro o si pulsas &#39;s&#39; en las slides.
344+
@end-notes </code></pre>
267345
<aside class="notes">
268346
Esto solo es visible en modo libro o si pulsas ‘s’ en las slides.
269347
</aside>
@@ -288,7 +366,7 @@ <h2 id="mathjax">MathJax</h2>
288366
<p>Así esto:</p>
289367
<pre><code>$$x = {-b \pm \sqrt{b^2-4ac}}.$$</code></pre>
290368
<p>Se transforma en:</p>
291-
<p><br /><span class="math display">$$x = {-b \pm \sqrt{b^2-4ac}}.$$</span><br /></p>
369+
<p><span class="math display">\[x = {-b \pm \sqrt{b^2-4ac}}.\]</span></p>
292370
<h2 id="código">Código</h2>
293371
<div class="sourceCode" id="cb12"><pre class="sourceCode javascript"><code class="sourceCode javascript"><span id="cb12-1"><a href="#cb12-1"></a><span class="kw">function</span> <span class="fu">holaMundo</span>() {</span>
294372
<span id="cb12-2"><a href="#cb12-2"></a> alert(<span class="st">&#39;Hola mundo&#39;</span>)<span class="op">;</span></span>
@@ -441,6 +519,13 @@ <h2 id="versión-5.0">Versión 5.0</h2>
441519
<li>Añadido el plugin <a href="https://github.com/rajgoel/reveal.js-plugins/tree/master/chalkboard">chalkboard</a> gracias <a href="https://twitter.com/chavarria1991">Marcos Chavarría</a>.</li>
442520
<li>Añadida la posibilidad de crear una versión ‘plus’ con información extra en slides y libros.</li>
443521
</ul>
522+
<h2 id="versión-6.0">Versión 6.0</h2>
523+
<ul>
524+
<li>Añadida la posiibilidad de exportar a PowerPoint.</li>
525+
<li>Actualizado todas las librerías a la última versión.</li>
526+
<li>Actualizadas las plantillas.</li>
527+
<li>Actualizado el Dockerfile.</li>
528+
</ul>
444529
<h1 id="adolfo-sanz-de-diego-autor"><img src="../img/asanzdiego.png" style="box-shadow:none;vertical-align:middle;width:100px;" alt="Adolfo Sanz De Diego" /> Autor</h1>
445530
<h2 id="adolfo-sanz-de-diego">Adolfo Sanz De Diego</h2>
446531
<ul>

doc/export/leeme-book-plus.pdf

-1.31 KB
Binary file not shown.

doc/export/leeme-book.docx

56 Bytes
Binary file not shown.

doc/export/leeme-book.epub

82 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)