Skip to content

Commit c3093ab

Browse files
Penaz91Penaz91
committed
Updates to template and makefile
1 parent b88ef71 commit c3093ab

File tree

3 files changed

+21
-30
lines changed

3 files changed

+21
-30
lines changed

‎Makefile

+21-21
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,39 @@ GLADTEX_PKG=gladtex -d "gladtex_imgs" --png -P -p "\usepackage{cancel}\usepackag
1616

1717
all: pseudocode python cpp js lua epub_pseudocode epub_python epub_cpp epub_js epub_lua
1818

19-
pseudocode:
20-
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=pseudocode -o Pseudocode_Edition.pdf
19+
pseudocode: Makefile | output
20+
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=pseudocode -o output/Pseudocode_Edition.pdf
2121

22-
python:
23-
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=python -o Python_Edition.pdf
22+
python: Makefile | output
23+
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=python -o output/Python_Edition.pdf
2424

25-
cpp:
26-
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=C++ -o C++_Edition.pdf
25+
cpp: Makefile | output
26+
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=C++ -o output/C++_Edition.pdf
2727

28-
js:
29-
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=javascript -o JS_Edition.pdf
28+
js: Makefile | output
29+
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=javascript -o output/JS_Edition.pdf
3030

31-
lua:
32-
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=lua -o Lua_Edition.pdf
31+
lua: Makefile | output
32+
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=lua -o output/Lua_Edition.pdf
3333

3434
latex:
3535
$(PANDOC_STANDALONE) $(PANDOC_DEFAULT_ARGS) $(CHAPTERS_CMD) $(VERSION) $(PDF_TEMPLATE) -M proglang=pseudocode -o Book_LaTeX.latex
3636

37-
epub_pseudocode:
38-
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="pseudocode" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o Pseudocode_Edition.epub
37+
epub_pseudocode: Makefile | output
38+
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="pseudocode" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o output/Pseudocode_Edition.epub
3939

40-
epub_python:
41-
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="python" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o Python_Edition.epub
40+
epub_python: Makefile | output
41+
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="python" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o output/Python_Edition.epub
4242

43-
epub_cpp:
44-
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="C++" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o C++_Edition.epub
43+
epub_cpp: Makefile | output
44+
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="C++" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o output/C++_Edition.epub
4545

46-
epub_js:
47-
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="javascript" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o JS_Edition.epub
46+
epub_js: Makefile | output
47+
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="javascript" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o output/JS_Edition.epub
4848

49-
epub_lua:
50-
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="lua" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o Lua_Edition.epub
49+
epub_lua: Makefile | output
50+
$(PANDOC) $(PANDOC_DEFAULT_ARGS) template/epub_addons/front_matter.md template/epub_addons/dedication.md $(CHAPTERS_CMD) $(VERSION) -M proglang="lua" -t json | $(GLADTEX_PKG) | $(PANDOC_STANDALONE) -f json $(EPUB_TEMPLATE) --to=epub -o output/Lua_Edition.epub
5151

5252
clean:
53-
rm -f *.pdf *.aux *.toc *.lol *.lot *.log *.out *.latex outsourced_descriptions.html gladtex_imgs/* *.epub *.mobi
53+
rm -f *.aux *.toc *.lol *.lot *.log *.out *.latex outsourced_descriptions.html gladtex_imgs/* output/*.pdf output/*.epub
5454
echo "Cleanup finished"

‎output/.gitkeep

Whitespace-only changes.

‎template/template.tex

-9
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
\addtolength{\cftsubsecnumwidth}{10pt}
2323
\addtolength{\cftsubsubsecnumwidth}{10pt}
2424
% --------------- Commands ---------------
25-
\newcommand{\tabitem}{~~\llap{\textbullet}~~}
26-
\newcommand{\ttabitem}{~~~~\llap{$$\circ$$}~~}
2725
\newcommand{\paidprod}{{\color{red}\textbf{[P]}}}
2826
\newcommand{\freeprod}{{\color{green!80!black}\textbf{[F]}}}
2927
\newcommand{\donprod}{{\color{orange}\textbf{[D]}}}
@@ -234,13 +232,6 @@
234232
\input{template/additional_languages/pseudocode}
235233
\input{template/additional_languages/javascript}
236234
% -----------------------------------------------
237-
% ------- \code command definition -------
238-
$if(proglang)$
239-
\newcommand{\code}[2]{\IfFileExists{./dynamic_listings/$proglang$/#1.txt}{\lstinputlisting[language=$proglang$,caption={#2}]{./dynamic_listings/$proglang$/#1.txt}}{\texttt{[MISSING CODE LISTING]}}}
240-
$else$
241-
\newcommand{\code}[2]{\IfFileExists{./dynamic_listings/pseudocode/#1.txt}{\lstinputlisting[caption={#2}]{./dynamic_listings/pseudocode/#1.txt}}{\texttt{[MISSING CODE LISTING]}}}
242-
$endif$
243-
% ----------------------------------------
244235

245236
% ------- Language highlighting config -------
246237
\definecolor{mygreen}{rgb}{0,0.6,0}

0 commit comments

Comments
 (0)