Aplikování patche od Michala Hofticha

hoftich
Emil Miler 5 years ago
parent 9a86e504e1
commit caaa192d14

@ -4,10 +4,10 @@ all: prace.pdf sighup
# LaTeX je potreba spustit nekolikrat, aby spravne spocital odkazy # LaTeX je potreba spustit nekolikrat, aby spravne spocital odkazy
prace.pdf: prace.tex $(wildcard *.tex) literatura.bib prace.xmpdata prace.pdf: prace.tex $(wildcard *.tex) literatura.bib prace.xmpdata
pdflatex $< lualatex $<
bibtex prace biber prace
pdflatex $< lualatex $<
pdflatex $< lualatex $<
clean: clean:
rm -f *.log *.dvi *.aux *.toc *.lof *.lot *.out *.bbl *.blg *.xmpi *.lol rm -f *.log *.dvi *.aux *.toc *.lof *.lot *.out *.bbl *.blg *.xmpi *.lol

@ -40,9 +40,9 @@ Generátor také vyždaduje konfigurační soubor \texttt{config.toml} v kořeno
# Adresa ze které se generují odkazy # Adresa ze které se generují odkazy
base_url = "https://ucitelonline.pedf.cuni.cz" base_url = "https://ucitelonline.pedf.cuni.cz"
# Název stránky # Název stránky
title = "Učitel online" title = "%(*Učitel online*)"
# Popis stránky # Popis stránky
description = "Web pro ditstribuci užitečných materiálů" description = "%(*Web pro distribuci užitečných materiálů*)"
# Zda se bude zpracovávat CSS systémem Sass # Zda se bude zpracovávat CSS systémem Sass
compile_sass = true compile_sass = true
\end{lstlisting} \end{lstlisting}

@ -9,7 +9,7 @@
@techreport{rfc7764, @techreport{rfc7764,
author = {Leonard, Sean}, author = {Leonard, Sean},
howpublished = {Internet Requests for Comments}, url = {Internet Requests for Comments},
institution = {Internet Engineering Task Force}, institution = {Internet Engineering Task Force},
issn = {2070-1721}, issn = {2070-1721},
journal = {IETF Documents}, journal = {IETF Documents},
@ -23,10 +23,10 @@
year = {2016} year = {2016}
} }
@misc{slant, @online{slant,
author = {Slant}, author = {Slant},
howpublished = {\url{https://web.archive.org/web/20200210061112/https://www.slant.co/topics/589/~best-markup-languages}}, url = {https://web.archive.org/web/20200210061112/https://www.slant.co/topics/589/~best-markup-languages},
note = {Cit. 2020-02-10}, urldate = {2020-02-10},
title = {What are the best markup languages?}, title = {What are the best markup languages?},
year = {2020} year = {2020}
} }
@ -58,18 +58,18 @@
year = {2012} year = {2012}
} }
@misc{pcmag_dynamic, @online{pcmag_dynamic,
author = {{PC{ }Magazine}}, author = {{PC{ }Magazine}},
howpublished = {\url{https://web.archive.org/web/20170117040526/https://www.pcmag.com/encyclopedia/term/42199/dynamic-web-page}}, url = {https://web.archive.org/web/20170117040526/https://www.pcmag.com/encyclopedia/term/42199/dynamic-web-page},
note = {Cit. 2020-02-12}, urldate = {2020-02-12},
title = {Definition of: dynamic Web page}, title = {Definition of: dynamic Web page},
year = {2017} year = {2017}
} }
@misc{pcmag_static, @misc{pcmag_static,
author = {{PC{ }Magazine}}, author = {{PC{ }Magazine}},
howpublished = {\url{https://web.archive.org/web/20200223095514/https://www.pcmag.com/encyclopedia/term/static-web-page}}, url = {https://web.archive.org/web/20200223095514/https://www.pcmag.com/encyclopedia/term/static-web-page},
note = {Cit. 2020-02-12}, urldate = {2020-02-12},
title = {Definition of: static Web page}, title = {Definition of: static Web page},
year = {2020} year = {2020}
} }
@ -77,8 +77,8 @@
@misc{mozttfb, @misc{mozttfb,
author = {Hoffman, Billy}, author = {Hoffman, Billy},
date = {2013-09-26}, date = {2013-09-26},
howpublished = {\url{https://web.archive.org/web/20190416124447/https://moz.com/blog/improving-search-rank-by-optimizing-your-time-to-first-byte}}, url = {https://web.archive.org/web/20190416124447/https://moz.com/blog/improving-search-rank-by-optimizing-your-time-to-first-byte},
note = {Cit. 2020-02-12}, urldate = {2020-02-12},
title = {Improving Search Rank by Optimizing Your Time to First Byte}, title = {Improving Search Rank by Optimizing Your Time to First Byte},
year = {2013} year = {2013}
} }
@ -86,9 +86,9 @@
@misc{financialtimes, @misc{financialtimes,
author = {Chadburn, Matt and Lahav, Gadi}, author = {Chadburn, Matt and Lahav, Gadi},
date = {2016-04-04}, date = {2016-04-04},
howpublished = {\url{https://web.archive.org/web/20180929125709/http://engineroom.ft.com/2016/04/04/a-faster-ft-com/}}, url = {https://web.archive.org/web/20180929125709/http://engineroom.ft.com/2016/04/04/a-faster-ft-com/},
journal = {Financial Times}, journal = {Financial Times},
note = {Cit. 2020-02-15}, urldate = {2020-02-15},
title = {How slow websites damage publishers revenue}, title = {How slow websites damage publishers revenue},
year = {2016} year = {2016}
} }
@ -96,34 +96,34 @@
@misc{nolatex, @misc{nolatex,
author = {Ol{\v s}{\'a}k, Petr}, author = {Ol{\v s}{\'a}k, Petr},
date = {1997-08-14}, date = {1997-08-14},
howpublished = {\url{http://petr.olsak.net/ftp/olsak/bulletin/nolatex.pdf}}, url = {http://petr.olsak.net/ftp/olsak/bulletin/nolatex.pdf},
title = {Pro{\v c} nerad pou{\v z}{\'\i}v{\'a}m LaTeX}, title = {Pro{\v c} nerad pou{\v z}{\'\i}v{\'a}m LaTeX},
year = {1997} year = {1997}
} }
@misc{daringfireball, @online{daringfireball,
author = {Gruber, John}, author = {Gruber, John},
date = {2004-12-14}, date = {2004-12-14},
howpublished = {\url{https://web.archive.org/web/20200227143926/https://daringfireball.net/projects/markdown/}}, url = {https://web.archive.org/web/20200227143926/https://daringfireball.net/projects/markdown/},
note = {Cit. 2020-02-27}, urldate = {2020-02-27},
title = {Markdown}, title = {Markdown},
year = {2004} year = {2004}
} }
@misc{softpedia_generators, @article{softpedia_generators,
author = {Cimpanu, Catalin}, author = {Cimpanu, Catalin},
date = {2015-05-22}, date = {2015-05-22},
howpublished = {\url{https://web.archive.org/web/20200316165614/https://news.softpedia.com/news/How-Static-Site-Generators-Work-482007.shtml}}, url = {https://web.archive.org/web/20200316165614/https://news.softpedia.com/news/How-Static-Site-Generators-Work-482007.shtml},
journal = {Softpedia}, journal = {Softpedia},
note = {Cit. 2020-03-16}, urldate = {2020-03-16},
title = {How Static Site Generators Work}, title = {How Static Site Generators Work},
year = {2015} year = {2015}
} }
@misc{commonmark, @misc{commonmark,
author = {MacFarlane, John}, author = {MacFarlane, John},
howpublished = {\url{https://spec.commonmark.org/}}, url = {https://spec.commonmark.org/},
note = {Cit. 2020-03-22}, urldate = {2020-03-22},
title = {CommonMark Spec}, title = {CommonMark Spec},
year = {2019} year = {2019}
} }
@ -131,23 +131,23 @@
@misc{calomel_optimization, @misc{calomel_optimization,
author = {Calomel}, author = {Calomel},
date = {2017-01-01}, date = {2017-01-01},
howpublished = {\url{https://calomel.org/save_web_bandwidth.html}}, url = {https://calomel.org/save_web_bandwidth.html},
note = {Cit. 2020-03-23}, urldate = {2020-03-23},
title = {Webserver Optimization and Bandwidth Saving Tips}, title = {Webserver Optimization and Bandwidth Saving Tips},
year = {2017} year = {2017}
} }
@misc{github_formal_markdown_spec, @misc{github_formal_markdown_spec,
author = {Mart{\'\i}, Vicent}, author = {Mart{\'\i}, Vicent},
howpublished = {\url{https://github.blog/2017-03-14-a-formal-spec-for-github-markdown/}}, url = {https://github.blog/2017-03-14-a-formal-spec-for-github-markdown/},
note = {Cit. 2020-03-23}, urldate = {2020-03-23},
title = {A formal spec for GitHub Flavored Markdown}, title = {A formal spec for GitHub Flavored Markdown},
year = {2017} year = {2017}
} }
@techreport{owasp2017, @techreport{owasp2017,
author = {OWASP}, author = {OWASP},
howpublished = {\url{https://owasp.org/www-pdf-archive/OWASP_Top_10-2017_%28en%29.pdf.pdf}}, url = {https://owasp.org/www-pdf-archive/OWASP_Top_10-2017_\%28en\%29.pdf.pdf},
institution = {OWASP}, institution = {OWASP},
journal = {OWASP Top Ten}, journal = {OWASP Top Ten},
organization = {OWASP}, organization = {OWASP},
@ -159,7 +159,7 @@
@misc{cve_wordpress, @misc{cve_wordpress,
author = {{CVE{ }Details}}, author = {{CVE{ }Details}},
howpublished = {\url{https://www.cvedetails.com/product/4096/Wordpress-Wordpress.html?vendor_id=2337}}, url = {https://www.cvedetails.com/product/4096/Wordpress-Wordpress.html?vendor_id=2337},
organization = {CVE{ }Details}, organization = {CVE{ }Details},
title = {Wordpress : Vulnerability Statistics}, title = {Wordpress : Vulnerability Statistics},
year = {2020} year = {2020}
@ -168,7 +168,7 @@
@article{thehackernews_wordpress_1, @article{thehackernews_wordpress_1,
author = {Khandelwal, Swati}, author = {Khandelwal, Swati},
date = {2020-02-17}, date = {2020-02-17},
howpublished = {\url{https://thehackernews.com/2020/02/themegrill-wordpress-plugin.html}}, url = {https://thehackernews.com/2020/02/themegrill-wordpress-plugin.html},
journal = {The Hacker News}, journal = {The Hacker News},
title = {Critical Bug in WordPress Theme Plugin Opens 200,000 Sites to Hackers}, title = {Critical Bug in WordPress Theme Plugin Opens 200,000 Sites to Hackers},
year = {2020} year = {2020}
@ -177,7 +177,7 @@
@article{thehackernews_wordpress_2, @article{thehackernews_wordpress_2,
author = {Khandelwal, Swati}, author = {Khandelwal, Swati},
date = {2019-12-13}, date = {2019-12-13},
howpublished = {\url{https://thehackernews.com/2019/12/wordpress-elementor-beaver.html}}, url = {https://thehackernews.com/2019/12/wordpress-elementor-beaver.html},
journal = {The Hacker News}, journal = {The Hacker News},
title = {Flaw in Elementor and Beaver Addons Let Anyone Hack WordPress Sites}, title = {Flaw in Elementor and Beaver Addons Let Anyone Hack WordPress Sites},
year = {2019} year = {2019}
@ -185,7 +185,7 @@
@misc{cve_php, @misc{cve_php,
author = {{CVE{ }Details}}, author = {{CVE{ }Details}},
howpublished = {\url{https://www.cvedetails.com/product/4096/Wordpress-Wordpress.html?vendor_id=2337}}, url = {https://www.cvedetails.com/product/4096/Wordpress-Wordpress.html?vendor_id=2337},
organization = {CVE{ }Details}, organization = {CVE{ }Details},
title = {PHP : Vulnerability Statistics}, title = {PHP : Vulnerability Statistics},
year = {2020} year = {2020}

@ -9,7 +9,7 @@
%%% a unsrt jsou standardní součástí latexových distribucí. Styl czplainnat %%% a unsrt jsou standardní součástí latexových distribucí. Styl czplainnat
%%% je dodáván s touto šablonou a bibTeX ho hledá v aktuálním adresáři. %%% je dodáván s touto šablonou a bibTeX ho hledá v aktuálním adresáři.
\bibliographystyle{czplainnat} %% Autor (rok) s českými spojkami %\bibliographystyle{czplainnat} %% Autor (rok) s českými spojkami
% \bibliographystyle{plainnat} %% Autor (rok) s anglickými spojkami % \bibliographystyle{plainnat} %% Autor (rok) s anglickými spojkami
% \bibliographystyle{unsrt} %% [číslo] % \bibliographystyle{unsrt} %% [číslo]
@ -18,7 +18,8 @@
%%% Vytvoření seznamu literatury. Pozor, pokud jste necitovali ani jednu %%% Vytvoření seznamu literatury. Pozor, pokud jste necitovali ani jednu
%%% položku, seznam se automaticky vynechá. %%% položku, seznam se automaticky vynechá.
\bibliography{literatura} %\bibliography{literatura}
\printbibliography
%%% Kdybyste chtěli bibliografii vytvářet ručně (bez bibTeXu), lze to udělat %%% Kdybyste chtěli bibliografii vytvářet ručně (bez bibTeXu), lze to udělat
%%% následovně. V takovém případě se řiďte normou ISO 690 a zvyklostmi v oboru. %%% následovně. V takovém případě se řiďte normou ISO 690 a zvyklostmi v oboru.

@ -28,12 +28,37 @@
%% kódování %% kódování
\usepackage{textcomp} % speciální symboly pro kódování T1 \usepackage{textcomp} % speciální symboly pro kódování T1
\usepackage[utf8]{inputenc} % vstupní kódování v UTF-8 % toto není v LuaLaTeXu potřeba
\usepackage[T1]{fontenc} % výstupní kódování v T1 (české znaky) % \usepackage[utf8]{inputenc} % vstupní kódování v UTF-8
% \usepackage[T1]{fontenc} % výstupní kódování v T1 (české znaky)
\usepackage[czech]{babel} % České řetězce a dělení slov
%% bibliografie %% bibliografie
\usepackage[czech]{babel} % Česká bibliografie % \usepackage[authoryear,colon,sort,round]{natbib}
\usepackage[authoryear,colon,sort,round]{natbib} % BibLaTeX je udržovaný balíček
% kvůli chybě v Babelu je ale třeba toto:
% zdroj: https://tex.stackexchange.com/a/529993/2891
\usepackage{etoolbox}
\makeatletter
\newcommand\my@hyphen{-}
\patchcmd\select@language{-}{\my@hyphen }{}{\fail}
\makeatother
\usepackage[style=iso-authoryear]{biblatex} % literatura ve stylu IS0 690
\let\citep\parencite % kompatibilita s natbibovými makry
\addbibresource{literatura.bib} % musíme nahrát literaturu
\ifdefined\directlua
\usepackage{luavlna}% zamezit jednoznakovým předložkám na koncích řádků
\fi
% použít dagger jako symbol pro poznámky pod čarou
% https://tex.stackexchange.com/a/829/2891
\usepackage[symbol,perpage]{footmisc}
\renewcommand{\thefootnote}{\fnsymbol{footnote}}
\DefineFNsymbols*{myfootnote}{\dagger\ddagger*\S\P\|% pořadí symbolů pro poznámky
{**}{\dagger\dagger}{\ddagger\ddagger}}
\setfnsymbol{myfootnote}
%% Formátování podle předpisů PedF %% Formátování podle předpisů PedF
% velikosti fontů jsou v základím nastavení správně % velikosti fontů jsou v základím nastavení správně
@ -72,38 +97,39 @@
showstringspaces=false, showstringspaces=false,
tabsize=4, tabsize=4,
breaklines=true, breaklines=true,
escapeinside={\%(*}{*)},
extendedchars=true, extendedchars=true,
literate= % literate=
{á}{{\'a}}1 % {á}{{\'a}}1
{č}{{\v{c}}}1 % {č}{{\v{c}}}1
{ď}{{\v{d}}}1 % {ď}{{\v{d}}}1
{é}{{\'e}}1 % {é}{{\'e}}1
{ě}{{\v{e}}}1 % {ě}{{\v{e}}}1
{í}{{\'i}}1 % {í}{{\'i}}1
{ň}{{\v{n}}}1 % {ň}{{\v{n}}}1
{ó}{{\'o}}1 % {ó}{{\'o}}1
{ř}{{\v{r}}}1 % {ř}{{\v{r}}}1
{š}{{\v{s}}}1 % {š}{{\v{s}}}1
{ť}{{\v{t}}}1 % {ť}{{\v{t}}}1
{ú}{{\'u}}1 % {ú}{{\'u}}1
{ů}{{\r{u}}}1 % {ů}{{\r{u}}}1
{ý}{{\'y}}1 % {ý}{{\'y}}1
{ž}{{\v{z}}}1 % {ž}{{\v{z}}}1
{Á}{{\'A}}1 % {Á}{{\'A}}1
{Č}{{\v{C}}}1 % {Č}{{\v{C}}}1
{Ď}{{\v{D}}}1 % {Ď}{{\v{D}}}1
{É}{{\'E}}1 % {É}{{\'E}}1
{Ě}{{\v{E}}}1 % {Ě}{{\v{E}}}1
{Í}{{\'I}}1 % {Í}{{\'I}}1
{Ň}{{\v{N}}}1 % {Ň}{{\v{N}}}1
{Ó}{{\'O}}1 % {Ó}{{\'O}}1
{Ř}{{\v{R}}}1 % {Ř}{{\v{R}}}1
{Š}{{\v{S}}}1 % {Š}{{\v{S}}}1
{Ť}{{\v{T}}}1 % {Ť}{{\v{T}}}1
{Ú}{{\'U}}1 % {Ú}{{\'U}}1
{Ů}{{\r{U}}}1 % {Ů}{{\r{U}}}1
{Ý}{{\'Y}}1 % {Ý}{{\'Y}}1
{Ž}{{\v{Z}}}1 % {Ž}{{\v{Z}}}1
} }
\renewcommand{\lstlistingname}{Program} % Přejmenování popisků \renewcommand{\lstlistingname}{Program} % Přejmenování popisků
\renewcommand{\lstlistlistingname}{Seznam programů} % Přejmenování názvu seznamu programů \renewcommand{\lstlistlistingname}{Seznam programů} % Přejmenování názvu seznamu programů