diff --git a/example/mu/Makefile b/example/mu/Makefile
index 3838f6a2db2fa373f399b4ee4a44dd11e1417e31..7216e1be53eecafe1eb6f1650e595bd6a6ef312e 100644
--- a/example/mu/Makefile
+++ b/example/mu/Makefile
@@ -3,6 +3,11 @@ PDFFILES=fi-pdflatex.pdf fi-lualatex.pdf sci-pdflatex.pdf sci-lualatex.pdf \
fss-pdflatex.pdf fss-lualatex.pdf fsps-pdflatex.pdf fsps-lualatex.pdf \
phil-pdflatex.pdf phil-lualatex.pdf law-pdflatex.pdf law-lualatex.pdf \
econ-pdflatex.pdf econ-lualatex.pdf
+PDFLATEX=pdflatex --shell-escape
+LUALATEX=lualatex
+AUXFILES=*.aux *.log *.out *.toc *.lot *.lof *.bcf *.blg *.run.xml \
+ *.bbl *.idx *.ind *.ilg *.markdown.*
+AUXDIRS=_markdown-*/
OUTPUT=$(PDFFILES) $(PDFFILES:.pdf=.tex)
.PHONY: all clean
@@ -17,26 +22,26 @@ all: $(OUTPUT) clean
# This target typesets a pdfLaTeX example.
%-pdflatex.pdf: %-pdflatex.tex example.bib
- pdflatex $< # The initial typesetting.
+ $(PDFLATEX) $< # The initial typesetting.
biber $(basename $<).bcf
- pdflatex $< # Update the index after the bibliography insertion.
+ $(PDFLATEX) $< # Update the index after the bibliography insertion.
texindy -I latex -C utf8 -L english $(basename $<).idx
- pdflatex $< # The final typesetting, now also with index.
- pdflatex $<
+ $(PDFLATEX) $< # The final typesetting, now also with index.
+ $(PDFLATEX) $<
# This target typesets a LuaLaTeX example.
%-lualatex.pdf: %-lualatex.tex example.bib
- lualatex $< # The initial typesetting.
+ $(LUALATEX) $< # The initial typesetting.
biber $(basename $<).bcf
- lualatex $< # Update the index after the bibliography insertion.
+ $(LUALATEX) $< # Update the index after the bibliography insertion.
texindy -I latex -C utf8 -L english $(basename $<).idx
- lualatex $< # The final typesetting, now also with index.
- lualatex $<
+ $(LUALATEX) $< # The final typesetting, now also with index.
+ $(LUALATEX) $<
# This target removes any auxiliary files.
clean:
- rm -f *.aux *.log *.out *.toc *.lot *.lof *.bcf *.blg *.run.xml \
- *.bbl *.idx *.ind *.ilg
+ rm -f $(AUXFILES)
+ rm -rf $(AUXDIRS)
# This target removes any auxiliary files
# and the output PDF files.
diff --git a/example/mu/example.dtx b/example/mu/example.dtx
index ad24a65652994c3b1197e263add9bc3c3c9d56ee..53e251887e4934270982f39329744ce504b51c33 100644
--- a/example/mu/example.dtx
+++ b/example/mu/example.dtx
@@ -411,11 +411,12 @@
\usepackage{makeidx} %% The `makeidx` package contains
\makeindex %% helper commands for index typesetting.
%% These additional packages are used within the document:
-\usepackage{paralist}
-\usepackage{amsmath}
+\usepackage{paralist} %% Compact list environments
+\usepackage{amsmath} %% Mathematics
\usepackage{amsthm}
\usepackage{amsfonts}
-\usepackage{url}
+\usepackage{url} %% Hyperlinks
+\usepackage{markdown} %% Lightweight Markup
\begin{document}
%<*econ>
\makeatletter
@@ -749,6 +750,115 @@ fonts will become available: \[
See \url{http://tex.stackexchange.com/a/58124/70941}.
}.
+\chapter{Using lightweight markup}
+%<*pdftex>
+\shorthandoff{-}
+%</pdftex>
+\begin{markdown*}{%
+ hybrid,
+ definitionLists,
+ footnotes,
+ hashEnumerators}
+
+If you decide that \LaTeX{} is too wordy for some parts of your
+document, there are [packages](https://www.ctan.org/pkg/markdown
+"Markdown") that allow you to use more lightweight markup next
+to it.
+
+ 
+
+This is a bullet list. Unlike numbered lists, bulleted lists
+contain an **unordered** set of bullet points. When a bullet point
+contains multiple paragraphs, the list is typeset as follows:
+
+ * The first item of a bullet list
+
+ that spans several paragraphs,
+ * the second item of a bullet list,
+ * the third item of a bullet list.
+
+When none of the bullet points contains multiple paragraphs, the
+list has a more compact form:
+
+ * The first item of a bullet list,
+ * the second item of a bullet list,
+ * the third item of a bullet list.
+
+Unlike a bulleted list, a numbered list implies chronology or
+ordering of the bullet points. When a bullet point
+contains multiple paragraphs, the list is typeset as follows:
+
+ 1. The first item of an ordered list
+
+ that spans several paragraphs,
+ 2. the second item of an ordered list,
+ 3. the third item of an ordered list.
+ #. If you are feeling lazy,
+ #. you can use hash enumerators as well.
+
+When none of the bullet points contains multiple paragraphs, the
+list has a more compact form:
+
+ 6. The first item of an ordered list,
+ 7. the second item of an ordered list,
+ 8. the third item of an ordered list.
+
+Definition lists are used to provide definitions of terms. When
+a definition contains multiple paragraphs, the list is typeset
+as follows:
+
+Term 1
+
+: Definition 1
+
+*Term 2*
+
+: Definition 2
+
+ Some code, part of Definition 2
+
+ Third paragraph of Definition 2.
+
+When none of the bullet points contains multiple paragraphs, the
+list has a more compact form:
+
+Term 1
+: Definition 1
+*Term 2*
+: Definition 2
+
+Block quotations are used to include an excerpt from an external
+document in way that visually clearly separates the excerpt from
+the rest of the work:
+
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+> Back to the first level.
+
+Footnotes are used to include additional information to the
+document that are not necessary for the understanding of the main
+text. Here is a footnote reference[^1] and another[^longnote].
+
+[^1]: Here is the footnote.
+
+[^longnote]: Here's one with multiple blocks.
+
+ Subsequent paragraphs are indented to show that they
+belong to the previous footnote.
+
+ Some code
+
+ The whole paragraph can be indented, or just the first
+ line. In this way, multi-paragraph footnotes work like
+ multi-paragraph list items.
+\end{markdown*}
+%<*pdftex>
+\shorthandon{-}
+%</pdftex>
+
\chapter{Inserting the bibliography}
After linking a bibliography data\-base files to the document using
the \verb"\"\texttt{thesissetup\{bib\discretionary{=}{=}{=}%
diff --git a/guide/mu/guide.dtx b/guide/mu/guide.dtx
index 977ba94022009ff5c9d4b0a2e9663c53f288da6a..be770b3c2dee4466263bdd0938db9489599e7dbf 100644
--- a/guide/mu/guide.dtx
+++ b/guide/mu/guide.dtx
@@ -277,11 +277,11 @@
Before using the \textsf{fithesis3} class, it is useful to be
familiar with the \LaTeX{} typesetting system. A good way to get
started is to read one of the introductory texts in English
- \cite{veryshortlatex,shortlatex,longlatex,latex} or in Czech
- \cite{rybicka03,satrapa11}. Taking one of the \textit{FI:PB029},
- \textit{PřF:M5751}, or \textit{FF:PLIN028} courses taught at
- the \makeatletter\thesis@english@universityName\makeatother\ is
- also helpful.
+ \parencite{veryshortlatex,shortlatex,longlatex,latex} or in Czech
+ \parencite{rybicka03,satrapa11}. Taking one of the
+ \textit{FI:PB029}, \textit{PřF:M5751}, or \textit{FF:PLIN028}
+ courses taught at the \makeatletter\thesis@english@universityName
+ \makeatother\ is also helpful.
To become familiar with \textsf{fithesis3}, you are encouraged to
inspect the example documents \makeatletter
@@ -322,15 +322,17 @@
documents.
If you are using the command line, you can typeset \LaTeX{}
- source files by running either \texttt{pdflatex
- \textit{name.tex}} or \texttt{lualatex
- \textit{name.tex}} (depending on your choice of \TeX\
- engine), where \texttt{\textit{name.tex}} corresponds to the name
- of a \LaTeX\ source file. In the case of the two aforementioned
- example files, the corresponding commands would be:
+ source files by running either the \texttt{pdflatex
+ -{}-shell-escape \textit{name.tex}} command or the
+ \texttt{lualatex \textit{name.tex}} command depending on your
+ chosen \TeX\ engine, where \texttt{\textit{name.tex}}
+ corresponds to the name of a \LaTeX\ source file. In the case of
+ the two aforementioned example files, the corresponding commands
+ would be
\begin{center}\makeatletter
- \texttt{pdflatex \thesis@faculty-pdflatex.tex}
-\\\texttt{lualatex \thesis@faculty-lualatex.tex}
+ \texttt{pdflatex -{}-shell-escape \thesis@faculty-pdflatex.tex}
+ for \hologo{pdfLaTeX},\\and \texttt{lualatex \thesis@faculty-%
+ lualatex.tex} for Lua\LaTeX{}.
\makeatother\end{center}
The command needs to be executed from within the directory, where
the \LaTeX\ source file is located. In Windows, the command line
diff --git a/test/mu/compare-example/expected-econ-lualatex.pdf b/test/mu/compare-example/expected-econ-lualatex.pdf
index bece1db6aa60e50253f03b74a47e598a6ad2f3fa..73edd3dfd20854069e00077fa9d2e43b208d9c58 100644
Binary files a/test/mu/compare-example/expected-econ-lualatex.pdf and b/test/mu/compare-example/expected-econ-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-econ-pdflatex.pdf b/test/mu/compare-example/expected-econ-pdflatex.pdf
index 64271918208d57b5003128b7bf67dcef5491c7d5..b86f36a7a3cbc6ef4987195fa09899f33746d341 100644
Binary files a/test/mu/compare-example/expected-econ-pdflatex.pdf and b/test/mu/compare-example/expected-econ-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-fi-lualatex.pdf b/test/mu/compare-example/expected-fi-lualatex.pdf
index 7977da37441b681ce925a54663e39fa93e410e37..cf8b50a427fb8f56dcc2969dd807f2ee24d8379a 100644
Binary files a/test/mu/compare-example/expected-fi-lualatex.pdf and b/test/mu/compare-example/expected-fi-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-fi-pdflatex.pdf b/test/mu/compare-example/expected-fi-pdflatex.pdf
index cdc6d92d60f9b7fa2457eb54b1d3697e2daa52a2..0f590d222995303c1506f996a1a60bd138bcd024 100644
Binary files a/test/mu/compare-example/expected-fi-pdflatex.pdf and b/test/mu/compare-example/expected-fi-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-fsps-lualatex.pdf b/test/mu/compare-example/expected-fsps-lualatex.pdf
index 4873c36031b33c6bb570c89b113656bcfe0e5909..5d6c738a89dc8a041cf00c19c8ad497c52317527 100644
Binary files a/test/mu/compare-example/expected-fsps-lualatex.pdf and b/test/mu/compare-example/expected-fsps-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-fsps-pdflatex.pdf b/test/mu/compare-example/expected-fsps-pdflatex.pdf
index 0f52b10d606cdd5a9d6fd2494e0e1bea2df08fb3..8c1c67536f7bc71ccd6ee3ffe67c03d58efa101c 100644
Binary files a/test/mu/compare-example/expected-fsps-pdflatex.pdf and b/test/mu/compare-example/expected-fsps-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-fss-lualatex.pdf b/test/mu/compare-example/expected-fss-lualatex.pdf
index 539057b1533d94910d1bd31d638bbf5d4ad1d2df..24381beb7c5f050ff3c2f8090ae5d881e219cbb5 100644
Binary files a/test/mu/compare-example/expected-fss-lualatex.pdf and b/test/mu/compare-example/expected-fss-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-fss-pdflatex.pdf b/test/mu/compare-example/expected-fss-pdflatex.pdf
index c7eef2aa40809a00412ecca5cc275a5a87c6248a..6160bb17beeb01a0d43b2b3320bf8c10163e3176 100644
Binary files a/test/mu/compare-example/expected-fss-pdflatex.pdf and b/test/mu/compare-example/expected-fss-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-law-lualatex.pdf b/test/mu/compare-example/expected-law-lualatex.pdf
index d1926133297319c6b562d1126b33e996f0d69840..b93fcf0405385fef6699293a912496a614fde042 100644
Binary files a/test/mu/compare-example/expected-law-lualatex.pdf and b/test/mu/compare-example/expected-law-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-law-pdflatex.pdf b/test/mu/compare-example/expected-law-pdflatex.pdf
index 617fb02938528a767f20008b2d7a2b7fb7eaacc2..9f8dbb16807b21f0bf80c581a662c40b19c0a2c3 100644
Binary files a/test/mu/compare-example/expected-law-pdflatex.pdf and b/test/mu/compare-example/expected-law-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-med-lualatex.pdf b/test/mu/compare-example/expected-med-lualatex.pdf
index 9b6926561ec3a8e81eea04c12c759b0c450292a2..c9b1728002c879210429de76e4ae125922c6ea46 100644
Binary files a/test/mu/compare-example/expected-med-lualatex.pdf and b/test/mu/compare-example/expected-med-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-med-pdflatex.pdf b/test/mu/compare-example/expected-med-pdflatex.pdf
index 367378d2a19eac2a127eb1f10b204ca3c11d0294..9068eafa667a70977868cc9254b578cf0ac93ec2 100644
Binary files a/test/mu/compare-example/expected-med-pdflatex.pdf and b/test/mu/compare-example/expected-med-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-ped-lualatex.pdf b/test/mu/compare-example/expected-ped-lualatex.pdf
index b2df0ba5e45aa15be0237b5da1b066a16ce89cca..271ae9b29e8c764cb6b4fd66d56a287caceafef8 100644
Binary files a/test/mu/compare-example/expected-ped-lualatex.pdf and b/test/mu/compare-example/expected-ped-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-ped-pdflatex.pdf b/test/mu/compare-example/expected-ped-pdflatex.pdf
index 437ece10cdcfd24e3b1ff7742f7bb94d26fd7ee3..2c9073b2c0194b0853ddbeeee46ff2189cb29997 100644
Binary files a/test/mu/compare-example/expected-ped-pdflatex.pdf and b/test/mu/compare-example/expected-ped-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-phil-lualatex.pdf b/test/mu/compare-example/expected-phil-lualatex.pdf
index d9d93dced977664f873910cce2d5b02f9bed2e5f..4a7741d95d826e846f7a85b7710cb00b44e9df25 100644
Binary files a/test/mu/compare-example/expected-phil-lualatex.pdf and b/test/mu/compare-example/expected-phil-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-phil-pdflatex.pdf b/test/mu/compare-example/expected-phil-pdflatex.pdf
index 7b531e66a7ed421c72342a52047c2ec540a28530..eec6728c8befcbbfeaa04e7b669b7bc0bddd2578 100644
Binary files a/test/mu/compare-example/expected-phil-pdflatex.pdf and b/test/mu/compare-example/expected-phil-pdflatex.pdf differ
diff --git a/test/mu/compare-example/expected-sci-lualatex.pdf b/test/mu/compare-example/expected-sci-lualatex.pdf
index eba3158bd8bfe403c596f3a727d2590f8a9222f5..8c0eb17bd357b5ec27d696c03809d22dc27cb745 100644
Binary files a/test/mu/compare-example/expected-sci-lualatex.pdf and b/test/mu/compare-example/expected-sci-lualatex.pdf differ
diff --git a/test/mu/compare-example/expected-sci-pdflatex.pdf b/test/mu/compare-example/expected-sci-pdflatex.pdf
index 79eb313f84f5626492e24961c27843a3df633f35..f2d5ef6f5444ff38c4ca0b2b33eb2013aa97fbd6 100644
Binary files a/test/mu/compare-example/expected-sci-pdflatex.pdf and b/test/mu/compare-example/expected-sci-pdflatex.pdf differ