diff --git a/Makefile b/Makefile
index 3bf0c392ee696d197701c0df949e0e54c0e1f2e4..f83c7ee54551fe44b4c2efd94d0f70f0eb9b10af 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
CLASSFILES=fit1[012].clo fithesis.cls fithesis[23].cls
AUXFILES=example.aux example.log example.out example.toc example.lot example.lof fithesis.aux fithesis.log fithesis.toc fithesis.ind fithesis.idx fithesis.out fithesis.ilg fithesis.gls fithesis.glo
PDFFILES=fithesis.pdf example.pdf
-LOGOFILES=loga/phil-logo.eps loga/med-logo.pdf loga/fi-logo.pdf loga/ped-logo.pdf loga/med-logo.eps loga/sci-logo.eps loga/fsps-logo.pdf loga/fss-logo.pdf loga/color/phil-logo.eps loga/color/examples.pdf loga/color/med-logo.pdf loga/color/fi-logo.pdf loga/color/ped-logo.pdf loga/color/med-logo.eps loga/color/sci-logo.eps loga/color/fsps-logo.pdf loga/color/fss-logo.pdf loga/color/fsps-logo.eps loga/color/law-logo.eps loga/color/ped-logo.eps loga/color/sci-logo.pdf loga/color/law-logo.pdf loga/color/fi-logo.eps loga/color/fss-logo.eps loga/color/eco-logo.eps loga/color/eco-logo.pdf loga/color/phil-logo.pdf loga/fsps-logo.eps loga/law-logo.eps loga/ped-logo.eps loga/sci-logo.pdf loga/law-logo.pdf loga/fi-logo.eps loga/fss-logo.eps loga/eco-logo.eps loga/eco-logo.pdf loga/phil-logo.pdf
+LOGOFILES=loga/phil-logo.eps loga/med-logo.pdf loga/fi-logo.pdf loga/ped-logo.pdf loga/med-logo.eps loga/sci-logo.eps loga/fsps-logo.pdf loga/fss-logo.pdf loga/color/phil-logo.eps loga/color/examples.pdf loga/color/med-logo.pdf loga/color/fi-logo.pdf loga/color/ped-logo.pdf loga/color/med-logo.eps loga/color/sci-logo.eps loga/color/fsps-logo.pdf loga/color/fss-logo.pdf loga/color/fsps-logo.eps loga/color/law-logo.eps loga/color/ped-logo.eps loga/color/sci-logo.pdf loga/color/law-logo.pdf loga/color/fi-logo.eps loga/color/fss-logo.eps loga/color/econ-logo.eps loga/color/econ-logo.pdf loga/color/phil-logo.pdf loga/fsps-logo.eps loga/law-logo.eps loga/ped-logo.eps loga/sci-logo.pdf loga/law-logo.pdf loga/fi-logo.eps loga/fss-logo.eps loga/econ-logo.eps loga/econ-logo.pdf loga/phil-logo.pdf
SOURCEFILE=fithesis.dtx
OTHERFILES=csquot.sty example.tex fithesis.ins Makefile
INSTALLFILES=$(CLASSFILES) $(LOGOFILES) $(PDFFILES) $(SOURCEFILE) $(OTHERFILES)
diff --git a/example.pdf b/example.pdf
index aad3539db36d8c494a99b9bcc932541e64433239..3f9e8d1748d63fbe26f7396ecaff2118cfd1e007 100644
Binary files a/example.pdf and b/example.pdf differ
diff --git a/example.tex b/example.tex
index a8eedd1d0a0c64bb8073b7bca368f07b23767dee..45dd6800c531b440467b963ba04d216c4248a3ec 100644
--- a/example.tex
+++ b/example.tex
@@ -2,6 +2,12 @@
\usepackage[english]{babel} % Multilingual support
\usepackage[utf8]{inputenc} % UTF-8 encoding
\usepackage[T1]{fontenc} % T1 font encoding
+\usepackage[ % A sans serif font that blends
+ scaled=0.86 % well with Palatino
+]{berasans}
+\usepackage[ % A tt font if you do not like LM's tt
+ scaled=1.03
+]{inconsolata}
\usepackage{blindtext} % Lorem ipsum generator
\usepackage[toc,page]{appendix} % Appendices
diff --git a/fit10.clo b/fit10.clo
index 48218efd2c20f9e1ef1252d938e13558098298c8..0fdb90162e41f4a444fe5ce13a9edfb0843a474f 100644
--- a/fit10.clo
+++ b/fit10.clo
@@ -51,7 +51,7 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{fit10.clo}[2015/02/03 fithesis3 (size option)]
+\ProvidesFile{fit10.clo}[2015/03/04 fithesis3 (size option)]
\renewcommand{\normalsize}{\fontsize\@xpt{12}\selectfont%
\abovedisplayskip 10\p@ plus2\p@ minus5\p@
@@ -139,59 +139,72 @@
\@endparpenalty -\@lowpenalty
\@itempenalty -\@lowpenalty
-\newif\iffichapters
-\fichaptersfalse
-\ifx\clsclass\Scrreprtcls\fichapterstrue\fi
-\ifx\clsclass\RapportIcls\fichapterstrue\fi
-\ifx\clsclass\RapportIIIcls\fichapterstrue\fi
-\iffichapters
+\let\@fichapters\False
+\ifx\clsclass\Scrreprtcls\let\@fichapters\True\fi
+\ifx\clsclass\RapportIcls\let\@fichapters\True\fi
+\ifx\clsclass\RapportIIIcls\let\@fichapters\True\fi
+\ifx\@fichapters\True
\def\@makechapterhead#1{%
- {\setlength\parindent{\z@}%
- \setlength\parskip {\z@}%
- \ifnum \c@secnumdepth >\m@ne
- \par\nobreak
- \vskip 10\p@
+ {%
+ \setlength\parindent{\z@}%
+ \setlength\parskip {\z@}%
+ \ifnum
+ \c@secnumdepth >\m@ne
+ \par\nobreak
+ \vskip 10\p@
\fi
\Large \ChapFont \thechapter{} \space #1\par
\nobreak
\vskip 20\p@
- }}
+ }%
+ }
\def\@makeschapterhead#1{%
- {\setlength\parindent{\z@}%
- \setlength\parskip {\z@}%
- \Large \ChapFont #1\par
+ {%
+ \setlength\parindent{\z@}%
+ \setlength\parskip {\z@}%
+ \Large \ChapFont #1\par
\nobreak
\vskip 20\p@
- }}
+ }%
+ }
- \def\chapter{\clearpage
+ \def\chapter{%
+ \clearpage
\thispagestyle{plain}
\global\@topnum\z@
\@afterindentfalse
- \secdef\@chapter\@schapter}
+ \secdef\@chapter\@schapter
+ }
- \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}{\protect
- \numberline{\thechapter}\bfseries #1}\else
-\addcontentsline{toc}{chapter}{\bfseries #1}\fi
- \chaptermark{#1}%
- \addtocontents{lof}%
- {\protect\addvspace{4\p@}}
- \addtocontents{lot}%
- {\protect\addvspace{4\p@}}
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else \@makechapterhead{#2}%
- \@afterheading
- \fi}
+ \def\@chapter[#1]#2{%
+ \ifnum \c@secnumdepth
+ >\m@ne
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}{\protect
+ \numberline{\thechapter}\bfseries #1}
+ \else%
+ \addcontentsline{toc}{chapter}{\bfseries #1}
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}%
+ {\protect\addvspace{4\p@}}
+ \addtocontents{lot}%
+ {\protect\addvspace{4\p@}}
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi
+ }
%\def\@schapter#1{\if@twocolumn \@topnewpage[\@makeschapterhead{#1}]%
% \else \@makeschapterhead{#1}%
% \markright{#1}
% \@afterheading\fi}
+\fi
\def\section{\@startsection {section}{1}{\z@}{-3.5ex plus-1ex minus
-.2ex}{2.3ex plus.2ex}{\reset@font\large\bfseries}}
diff --git a/fit11.clo b/fit11.clo
index 6aac5fdd3e3e5267af6358fc2031eae72c6fd7b3..150b20661ab67c76a342fced9bcf1cbdc7028a8f 100644
--- a/fit11.clo
+++ b/fit11.clo
@@ -51,7 +51,7 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{fit11.clo}[2015/02/03 fithesis3 (size option)]
+\ProvidesFile{fit11.clo}[2015/03/04 fithesis3 (size option)]
\renewcommand{\normalsize}{\fontsize\@xipt{14}\selectfont%
\abovedisplayskip 11\p@ plus3\p@ minus6\p@
@@ -138,59 +138,72 @@
\@endparpenalty -\@lowpenalty
\@itempenalty -\@lowpenalty
-\newif\iffichapters
-\fichaptersfalse
-\ifx\clsclass\Scrreprtcls\fichapterstrue\fi
-\ifx\clsclass\RapportIcls\fichapterstrue\fi
-\ifx\clsclass\RapportIIIcls\fichapterstrue\fi
-\iffichapters
+\let\@fichapters\False
+\ifx\clsclass\Scrreprtcls\let\@fichapters\True\fi
+\ifx\clsclass\RapportIcls\let\@fichapters\True\fi
+\ifx\clsclass\RapportIIIcls\let\@fichapters\True\fi
+\ifx\@fichapters\True
\def\@makechapterhead#1{%
- {\setlength\parindent{\z@}%
- \setlength\parskip {\z@}%
- \ifnum \c@secnumdepth >\m@ne
- \par\nobreak
- \vskip 10\p@
+ {%
+ \setlength\parindent{\z@}%
+ \setlength\parskip {\z@}%
+ \ifnum
+ \c@secnumdepth >\m@ne
+ \par\nobreak
+ \vskip 10\p@
\fi
\Large \ChapFont \thechapter{} \space #1\par
\nobreak
\vskip 20\p@
- }}
+ }%
+ }
\def\@makeschapterhead#1{%
- {\setlength\parindent{\z@}%
- \setlength\parskip {\z@}%
- \Large \ChapFont #1\par
+ {%
+ \setlength\parindent{\z@}%
+ \setlength\parskip {\z@}%
+ \Large \ChapFont #1\par
\nobreak
\vskip 20\p@
- }}
+ }%
+ }
- \def\chapter{\clearpage
+ \def\chapter{%
+ \clearpage
\thispagestyle{plain}
\global\@topnum\z@
\@afterindentfalse
- \secdef\@chapter\@schapter}
+ \secdef\@chapter\@schapter
+ }
- \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}{\protect
- \numberline{\thechapter}\bfseries #1}\else
-\addcontentsline{toc}{chapter}{\bfseries #1}\fi
- \chaptermark{#1}%
- \addtocontents{lof}%
- {\protect\addvspace{4\p@}}
- \addtocontents{lot}%
- {\protect\addvspace{4\p@}}
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else \@makechapterhead{#2}%
- \@afterheading
- \fi}
+ \def\@chapter[#1]#2{%
+ \ifnum \c@secnumdepth
+ >\m@ne
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}{\protect
+ \numberline{\thechapter}\bfseries #1}
+ \else%
+ \addcontentsline{toc}{chapter}{\bfseries #1}
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}%
+ {\protect\addvspace{4\p@}}
+ \addtocontents{lot}%
+ {\protect\addvspace{4\p@}}
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi
+ }
%\def\@schapter#1{\if@twocolumn \@topnewpage[\@makeschapterhead{#1}]%
% \else \@makeschapterhead{#1}%
% \markright{#1}
% \@afterheading\fi}
+\fi
\def\section{\@startsection {section}{1}{\z@}{-3.5ex plus-1ex minus
-.2ex}{2.3ex plus.2ex}{\reset@font\large\bfseries}}
diff --git a/fit12.clo b/fit12.clo
index 4050aa67c4f2a3fc9c0ac8857b452db92fc1e6c4..293861e1acf00c6834d9d2ab2fc507727118ff19 100644
--- a/fit12.clo
+++ b/fit12.clo
@@ -51,7 +51,7 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{fit12.clo}[2015/02/03 fithesis3 (size option)]
+\ProvidesFile{fit12.clo}[2015/03/04 fithesis3 (size option)]
\renewcommand{\normalsize}{\fontsize\@xiipt{14.5}\selectfont%
\abovedisplayskip 12\p@ plus3\p@ minus7\p@
@@ -140,59 +140,72 @@
\@endparpenalty -\@lowpenalty
\@itempenalty -\@lowpenalty
-\newif\iffichapters
-\fichaptersfalse
-\ifx\clsclass\Scrreprtcls\fichapterstrue\fi
-\ifx\clsclass\RapportIcls\fichapterstrue\fi
-\ifx\clsclass\RapportIIIcls\fichapterstrue\fi
-\iffichapters
+\let\@fichapters\False
+\ifx\clsclass\Scrreprtcls\let\@fichapters\True\fi
+\ifx\clsclass\RapportIcls\let\@fichapters\True\fi
+\ifx\clsclass\RapportIIIcls\let\@fichapters\True\fi
+\ifx\@fichapters\True
\def\@makechapterhead#1{%
- {\setlength\parindent{\z@}%
- \setlength\parskip {\z@}%
- \ifnum \c@secnumdepth >\m@ne
- \par\nobreak
- \vskip 10\p@
+ {%
+ \setlength\parindent{\z@}%
+ \setlength\parskip {\z@}%
+ \ifnum
+ \c@secnumdepth >\m@ne
+ \par\nobreak
+ \vskip 10\p@
\fi
\Large \ChapFont \thechapter{} \space #1\par
\nobreak
\vskip 20\p@
- }}
+ }%
+ }
\def\@makeschapterhead#1{%
- {\setlength\parindent{\z@}%
- \setlength\parskip {\z@}%
- \Large \ChapFont #1\par
+ {%
+ \setlength\parindent{\z@}%
+ \setlength\parskip {\z@}%
+ \Large \ChapFont #1\par
\nobreak
\vskip 20\p@
- }}
+ }%
+ }
- \def\chapter{\clearpage
+ \def\chapter{%
+ \clearpage
\thispagestyle{plain}
\global\@topnum\z@
\@afterindentfalse
- \secdef\@chapter\@schapter}
+ \secdef\@chapter\@schapter
+ }
- \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}{\protect
- \numberline{\thechapter}\bfseries #1}\else
-\addcontentsline{toc}{chapter}{\bfseries #1}\fi
- \chaptermark{#1}%
- \addtocontents{lof}%
- {\protect\addvspace{4\p@}}
- \addtocontents{lot}%
- {\protect\addvspace{4\p@}}
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else \@makechapterhead{#2}%
- \@afterheading
- \fi}
+ \def\@chapter[#1]#2{%
+ \ifnum \c@secnumdepth
+ >\m@ne
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}{\protect
+ \numberline{\thechapter}\bfseries #1}
+ \else%
+ \addcontentsline{toc}{chapter}{\bfseries #1}
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}%
+ {\protect\addvspace{4\p@}}
+ \addtocontents{lot}%
+ {\protect\addvspace{4\p@}}
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi
+ }
%\def\@schapter#1{\if@twocolumn \@topnewpage[\@makeschapterhead{#1}]%
% \else \@makeschapterhead{#1}%
% \markright{#1}
% \@afterheading\fi}
+\fi
\def\section{\@startsection {section}{1}{\z@}{-3.5ex plus-1ex minus
-.2ex}{2.3ex plus.2ex}{\reset@font\large\bfseries}}
diff --git a/fithesis.cls b/fithesis.cls
index 6c4e816fd77d671ced54de969311ddcefab87c11..f162043ae687330d6c552e497816746cfe09eb80 100644
--- a/fithesis.cls
+++ b/fithesis.cls
@@ -52,7 +52,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{oldfithesis1}[2015/02/03 old fithesis will load fithesis3 version 0.3.07 MU thesis class]
+\ProvidesClass{oldfithesis1}[2015/03/04 old fithesis will load fithesis3 version 0.3.08 MU thesis class]
\errmessage{%
You are using the fithesis class, which has been deprecated.
diff --git a/fithesis.pdf b/fithesis.pdf
index 86dec6a55bf87e48113b82eec5514bea54846b80..bff066a03f22128ede2f5c967e5ad8a35ed5b1b3 100644
Binary files a/fithesis.pdf and b/fithesis.pdf differ
diff --git a/fithesis.raw.dtx b/fithesis.raw.dtx
index bf14733c0f4813fa8fe84879fce11ea6e7121546..dfeee74c5ab7483b7e5be02520436c761a8a7312 100644
--- a/fithesis.raw.dtx
+++ b/fithesis.raw.dtx
@@ -34,6 +34,9 @@
\usepackage[utf8]{inputenc} % this file uses UTF-8
\usepackage[czech]{babel}
\usepackage{tgpagella}
+\usepackage{verbatim}
+\usepackage[scaled=0.86]{berasans}
+% \usepackage[scaled=1.03]{inconsolata}
\usepackage[resetfonts]{cmap}
\usepackage[T1]{fontenc} % use 8bit fonts
\usepackage{csquot,mflogo}
@@ -71,6 +74,10 @@ na nichĹľ je poloĹľka pouĹľita.
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% \changes{v0.3.08} {2015/03/04}{Fixed a non-terminated \cs{if} condition.
+% [VN] (backport of v0.2.18)\\Fixed mostly documentation errors reported
+% at the new fithesis discussion forum (-ti, eco$\rightarrow$econ, implicit
+% twocolumn, example extended (font setup), etc.). [PS] (backport of v0.2.17)}
% \changes{v0.3.07} {2015/02/03}{Replaced the \cs{thesiswoman} command with
% \cs{thesisgender}. [VN]}
% \changes{v0.3.06} {2015/01/26}{Added the colorx package and the base colors
@@ -109,7 +116,7 @@ na nichĹľ je poloĹľka pouĹľita.
% \changes{v0.2.10} {2006/05/12}{fix EN name of Acknowledgement [JP]}
% \changes{v0.2.09} {2006/05/08}{add EN version of University name [JP]}
% \changes{v0.2.08} {2006/01/20}{add change of University name [JP]}
-% \changes{v0.2.07} {2005/05/10}{escape all czech letters [JP]
+% \changes{v0.2.07} {2005/05/10}{escape all Czech letters [JP]
% babel is used instead of stupid package czech [JP]
% \cs{MainMatter} should be placed after \cs{tablesofcontents} [PS]}
% \changes{v0.2.06} {2004/12/22}{fix : behind Advisor [JP]}
@@ -120,13 +127,13 @@ na nichĹľ je poloĹľka pouĹľita.
% \changes{v0.2.01} {2004/05/11}{add subsubsection to toc [JP]}
% \changes{v0.2.00} {2004/05/03}{add sk lang [JP, Peter Cerensky]
% set default cls class to \textsf{rapport3} [JP]}
-% \changes{v0.1g} {2004/04/01}{change of default size (12pt->11pt) [JP]}
+% \changes{v0.1g} {2004/04/01}{change of default size (12pt$\rightarrow$11pt) [JP]}
% \changes{v0.1f} {2004/01/24}{add documentation for hyperref [JP]}
% \changes{v0.1e} {2004/01/07}{add Brno to MU title [JP]}
% \changes{v0.1d} {2003/03/24}{removed def schapter from fit1*.clo [JP]}
% \changes{v0.1c} {2003/02/21}{default values of \cs{facultyname} and
% \\\cs{@thesissubtitle} set for backward compatibility) [PS]}
-% \changes{v0.1b} {2003/02/14}{change of default size (11pt->12pt) [JP]}
+% \changes{v0.1b} {2003/02/14}{change of default size (11pt$\rightarrow$12pt) [JP]}
% \changes{v0.1a} {2003/02/12}{minor documentation changes (CZ only,
% sorry) [PS]}
% \changes{v0.1} {2003/02/11}{new release, documentation editing (CZ only,
@@ -142,7 +149,7 @@ na nichĹľ je poloĹľka pouĹľita.
% \newcommand{\prikaz}[1]{\texttt{\bs #1}}
% \newcommand{\fit}{\textsf{fithesis3}}
% \newcommand{\itm}[1]{\noindent{\bf #1}}
-% \title{Sada maker \fit\ pro sazbu závěrečných pracà MU}
+% \title{Sada maker \fit\ pro~sazbu~závÄ›reÄŤnĂ˝ch~pracĂ~MU}
% \author{Daniel Marek, Jan PavloviÄŤ, VĂt NovotnĂ˝, Petr Sojka}
% \date{\today}
% \maketitle
@@ -192,7 +199,7 @@ na nichĹľ je poloĹľka pouĹľita.
% \end{verbatim}
% je možné přeložit dokumentaci.
%
-% Na fakultnĂch strojĂch se v aktuálnĂ distribuci modulu \texttt{texlive}
+% Na fakultnĂch strojĂch se v~aktuálnĂ distribuci modulu \texttt{texlive}
% nacházĂ pouze tĹ™Ăda \textsf{fithesis3}. Pokud chcete pouĹľĂt tĹ™Ădu
% \textsf{fithesis2}, nahraÄŹte jej modulem \texttt{texlive-2014} pomocĂ pĹ™Ăkazu
% \begin{verbatim}module switch texlive texlive-2014\end{verbatim}
@@ -227,30 +234,31 @@ na nichĹľ je poloĹľka pouĹľita.
% Možné volby jsou tyto:
% \begin{itemize}
% \item [--]{\bf 10pt} -- ZmÄ›nĂ základnĂ velikost pĂsma na 10~bodĹŻ. PĹ™i
-% této volbě je počet řádek vysazené strany roven 40ti, průměrný počet
-% znaků na řádku se pohybuje mezi 70ti až 80ti. Nedoporučováno,
+% této volbě je počet řádek vysazené strany roven 40, průměrný počet
+% znaků na řádku se pohybuje mezi 70 až 80. Nedoporučováno,
% pokud nebude při výsledném tisku tiskové zrcadlo zvětšováno z~B5
% na A4.
-% \item [--]{\bf 11pt} -- ZákladnĂ velikost pĂsma bude 11 bodĹŻ.
+% \item [--]{\bf 11pt} -- ZákladnĂ velikost pĂsma bude 11~bodĹŻ.
% Tato volba byla ve staršà verzi nastavena implicitně.
% Počet řádek vysazené strany je~40,
% průměrný počet znaků na řádce při použità fontu Palatino
% je 65 aĹľ~70.
% \item [--]{\bf 12pt} -- ZákladnĂ velikost pĂsma se touto volbou zmÄ›nĂ na
-% 12 bodů. Počet řádek na stránce je 38, průměrný počet znaků na řádce
+% 12~bodů. Počet řádek na stránce je~38, průměrný počet znaků na řádce
% je 55 až 60. Tato volba je implicitnà a doporučována.
% \item [--]{\bf oneside} -- Tato volba umožnà sazbu práce pouze
% jednostranÄ›, je nastavena implicitnÄ›. Sazba je pouze
-% na stranách lichých. Tato volba je implicitnà a doporučována pro sazbu verze určené pro čtenà na monitoru.
-% \item [--]{\bf twoside} -- Sazba práce bude oboustraná,
+% na stranách lichých. Tato volba je implicitnà a doporučována
+% pro sazbu elektronické verze dokumentu.
+% \item [--]{\bf twoside} -- Sazba práce bude oboustranná,
% rozlišujà se liché a sudé strany, začátky kapitol a jiných významných
% celkĹŻ jsou umĂstÄ›ny vĹľdy na stranÄ› lichĂ©, tedy pravĂ©.
% Tato volba je doporučována pro sazbu verze určené pro tisk.
% \item [--]{\bf onecolumn} -- Implicitně nastavená volba pro sazbu textu
% do jednoho sloupce na stránce. Text je zarovnaný oba okraje sloupce.
+% Tato volba je implicitnà a je doporučována.
% \item [--]{\bf twocolumn} -- Tato volba umoĹľnĂ sazbu textu do dvou
% sloupců na stánku. Text je zarovnaný na oba okraje sloupce.
-% Tato volba je implicitnà a je doporučována.
% \item [--]{\bf draft} -- Po nastavenà této volby bude špatně zalomený
% text na koncĂch řádkĹŻ zvĂ˝raznÄ›n ÄŤernĂ˝m obdĂ©lnĂÄŤkem pro snažšà vizuálnĂ
% identifikaci. Dále volbu pĹ™ebĂrajĂ dalšà balĂky, jako je
@@ -372,7 +380,7 @@ na nichĹľ je poloĹľka pouĹľita.
\def\Fi{fi}
\def\Sci{sci}
\def\Law{law}
-\def\Eco{eco}
+\def\Econ{econ}
\def\Fss{fss}
\def\Med{med}
\def\Ped{ped}
@@ -413,10 +421,11 @@ na nichĹľ je poloĹľka pouĹľita.
% práce, jména studenta a roku vypracovánà vysadà také logo fakulty.
%
% \DescribeMacro{\thesistitle}
-% Makro umožnà vložit název práce, u dvouřádkových
-% ÄŤi vĂceřádkovĂ˝ch názvĹŻ se standardnÄ› oddÄ›lĂ jednotlivĂ© části
-% pĹ™Ăkazem $\backslash$$\backslash$ s volitelnĂ˝m parametrem
-% meziřádkového prokladu.
+% pĹ™Ăkazem $\backslash$$\backslash$ s~volitelnĂ˝m parametrem
+% meziřádkového prokladu. Dalšà možnostà je části nadpisu
+% požadované na stejném řádku (kolokace, fráze) spojit
+% nedělitelnou předložkou, neboť v~nadpisech je zakázáno
+% dělenà slov.
% \begin{macrocode}
\def\thesistitle#1{
\hypersetup{pdftitle={#1}}
@@ -471,14 +480,15 @@ na nichĹľ je poloĹľka pouĹľita.
% se také vložà patřičné logo a název fakulty na titulnà stránku.
% Jsou podporovány tyto fakulty MU:
% \begin{itemize}
-% \item Fakulta informatiky -- fi
+% \item Fakulta informatiky -- fi,
% \item PĹ™ĂrodovÄ›decká fakulta -- sci,
% \item Právnická fakulta -- law,
-% \item Ekonomicko-správnà fakulta -- eco,
+% \item Ekonomicko-správnà fakulta -- econ,
% \item Fakulta sociálnĂch studiĂ -- fss,
% \item Lékařská fakulta -- med,
% \item Pedagogická fakulta -- ped,
-% \item Filozofická fakulta -- phil
+% \item Filozofická fakulta -- phil,
+% \item Fakulta sportovnĂch studiĂ -- fsps.
% \end{itemize}
% napĹ™Ăklad: \prikaz{thesisfaculty\{fi\}}.
% \begin{macrocode}
@@ -524,7 +534,7 @@ na nichĹľ je poloĹľka pouĹľita.
\else
\def\facultyname{Pr\'{a}vnick\'{a} fakulta}
\fi
- \else\ifx\@thesisfaculty\Eco
+ \else\ifx\@thesisfaculty\Econ
% The Faculty of Economics and Administration
\definecolor{faculty}{HTML}{7C211E} % Pantone 1815
\definecolor{facultylight}{HTML}{DAC1BF}
@@ -632,7 +642,7 @@ na nichĹľ je poloĹľka pouĹľita.
% Makro umožnà stanovit jazyk, ve kterém je práce napsána. V~současné
% době jsou podporovány varianty cs nebo cz, sk a en. Jazyk je třeba
% stanovit pĹ™ed pouĹľitĂm pĹ™Ăkazu \prikaz{thesisfaculty}, jinak dojde
-% k vysázenà jména fakulty v češtině.
+% k~vysázenà jména fakulty v~češtině.
% \begin{macrocode}
\def\thesislang#1{\gdef\@thesislang{#1}%
\ifx\@thesislang\Langcz\gdef\@thesislang{cs}\fi}
@@ -647,8 +657,8 @@ na nichĹľ je poloĹľka pouĹľita.
je m\'{y}m p\r{u}vodn\'{i}m autorsk\'{y}m
d\'{i}lem, kter\'{e} jsem vypracoval\@w\ samostatn\v{e}. V\v{s}echny zdroje, prameny a
literaturu, kter\'{e} jsem p\v{r}i vypracov\'{a}n\'{i} pou\v{z}\'{i}val\@w\ nebo z~nich
- \v{c}erpal\@w, v~pr\'{a}ci \v{r}\'{a}dn\v{e} cituji s~uveden\'{i}m \'{u}pln\'{e}ho odkazu na p\v{r}\'{i}slu\v{s}n\'{y}
- zdroj.}
+ \v{c}erpal\@w, v~pr\'{a}ci \v{r}\'{a}dn\v{e} cituji s~uveden\'{i}m
+ \'{u}pln\'{e}ho odkazu na p\v{r}\'{i}slu\v{s}n\'{y} zdroj.}
\def\DeclarationTextsk{%
Prehlasujem, \v{z}e t\'{a}to \expandafter\lowecasewrapper\@thesissubtitle{}
je moj\'{i}m p\^{o}vodn\'{y}m autorsk\'{y}m
@@ -658,9 +668,9 @@ na nichĹľ je poloĹľka pouĹľita.
zdroj.}
\def\DeclarationTexten{%
Hereby I declare, that this paper is my original authorial work,
- which I have worked out by my own. All sources, references and literature used or excerpted
- during elaboration of this work are properly cited and listed in complete reference to the due source.
-}
+ which I have worked out by my own. All sources, references and
+ literature used or excerpted during elaboration of this work
+ are properly cited and listed in complete reference to the due source.}
\def\DeclarationTitlecs{%
Prohl\'{a}\v{s}en\'{i}
@@ -793,15 +803,15 @@ na nichĹľ je poloĹľka pouĹľita.
% \end{macrocode}
%
% \subsubsection*{Povinné části diplomové práce}
-% NásledujĂcĂ makra jsou potĹ™ebná k vysazenĂ povinnĂ˝ch částĂ diplomovĂ©
-% práce. Jsou jimi \textit{prohlášenĂ o samostatnĂ©m vypracovánĂ\/},
-% \textit{shrnutĂ diplomovĂ© práce\/} a \textit{klĂÄŤová slova\/}.
+% NásledujĂcĂ makra jsou potĹ™ebná k~vysazenĂ povinnĂ˝ch částĂ diplomovĂ©
+% práce. Jsou jimi \textit{prohlášenĂ o samostatnĂ©m vypracovánĂ},
+% \textit{shrnutĂ diplomovĂ© práce} a \textit{klĂÄŤová slova}.
% Nepovinnou částĂ je \textit{podÄ›kovánĂ\/}.
% Pro všechny tyto celky je vĹľdy definováno prostĹ™edĂ,
% které zajistà kromě vysazenà každé části na samostatnou stranu
% napĹ™Ăklad takĂ© jednotnĂ© styly nadpisĹŻ. PoslednĂ povinnou
-% částà je \textit{seznam literatury\/}, ten se, stejně jako
-% \textit{obsah diplomovĂ© práce\/} jiĹľ sázĂ pomocĂ
+% částà je \textit{seznam literatury}, ten se, stejně jako
+% \textit{obsah diplomovĂ© práce} jiĹľ sázĂ pomocĂ
% standardnĂch \LaTeX ovĂ˝ch pĹ™ĂkazĹŻ.
%
% \DescribeMacro{ThesisDeclaration}
@@ -942,77 +952,7 @@ na nichĹľ je poloĹľka pouĹľita.
% pĹ™Ăkazy. Následuje zjednodušenĂ˝ ukázkovĂ˝ pĹ™Ăklad
% \textit{kostry} diplomové práce.
%
-% \begin{verbatim}
-% \documentclass[12pt,oneside]{fithesis3}
-% \usepackage[english]{babel} % Multilingual support
-% \usepackage[utf8]{inputenc} % UTF-8 encoding
-% \usepackage[T1]{fontenc} % T1 font encoding
-% \usepackage[ % Clickable links
-% plainpages = false, % We have multiple page numberings
-% pdfpagelabels % Generate pdf page labels
-% ]{hyperref}
-% \usepackage{blindtext} % Lorem ipsum generator
-% \usepackage[toc,page]{appendix} % Appendices
-%
-% \thesislang{en} % The language of the thesis
-% \thesistitle{Sample thesis} % The title of the thesis
-% \thesissubtitle{Bachelor's thesis} % The type of the thesis
-% \thesisstudent{Jane Doe} % Your name
-% \thesisgender{female} % Your gender
-% \thesisfaculty{fi} % Your faculty
-% \thesisyear{spring \the\year} % The academic term of your thesis defense
-% \thesisadvisor{John Foo, Ph.D.} % Your advisor
-%
-% \begin{document}
-% \FrontMatter % The front matter
-% \ThesisTitlePage % The title page
-% \begin{ThesisDeclaration} % The declaration
-% \DeclarationText
-% \AdvisorName
-% \end{ThesisDeclaration}
-% \begin{ThesisThanks} % The acknowledgements (optional)
-% I would like to thank my supervisor\,\dots
-% \end{ThesisThanks}
-% \begin{ThesisAbstract} % The abstract
-% The aim of the bachelor work is to provide\,\dots
-% \end{ThesisAbstract}
-% \begin{ThesisKeyWords} % The keywords
-% keyword1, keyword2\,\dots
-% \end{ThesisKeyWords}
-% \tableofcontents % The table of contents
-%
-% \MainMatter % The main matter
-% \chapter{Introduction} % Chapters
-% \Blindtext
-% \chapter{Another chapter}
-% \blindtext
-% This chapter also contains a table \ref{table:example}.
-%
-% \begin{table}
-% \centering
-% \begin{tabular}{ccc}
-% \textbf{Column 1} & \textbf{Column 2} & \textbf{Column 3} \\
-% \hline
-% 1 & 2 & 3 \\
-% 4 & 5 & 6 \\
-% 7 & 8 & 9
-% \end{tabular}
-% \caption{A table full of depth and meaning}
-% \label{table:example}
-% \end{table}
-% % Bibliography
-% \listoftables % The list of tables (optional)
-% \listoffigures % The list of figures (optional)
-% % Index (optional)
-%
-% \begin{appendices} % Appendices
-% \chapter{First appendix}
-% \Blindtext
-% \chapter{Another appendix}
-% \Blindtext
-% \end{appendices}
-% \end{document}
-% \end{verbatim}
+% \verbatiminput{example.tex}
% \newpage
% \iffalse
% \begin{macrocode}
@@ -1289,59 +1229,72 @@ na nichĹľ je poloĹľka pouĹľita.
\@endparpenalty -\@lowpenalty
\@itempenalty -\@lowpenalty
-\newif\iffichapters
-\fichaptersfalse
-\ifx\clsclass\Scrreprtcls\fichapterstrue\fi
-\ifx\clsclass\RapportIcls\fichapterstrue\fi
-\ifx\clsclass\RapportIIIcls\fichapterstrue\fi
-\iffichapters
+\let\@fichapters\False
+\ifx\clsclass\Scrreprtcls\let\@fichapters\True\fi
+\ifx\clsclass\RapportIcls\let\@fichapters\True\fi
+\ifx\clsclass\RapportIIIcls\let\@fichapters\True\fi
+\ifx\@fichapters\True
\def\@makechapterhead#1{%
- {\setlength\parindent{\z@}%
- \setlength\parskip {\z@}%
- \ifnum \c@secnumdepth >\m@ne
- \par\nobreak
- \vskip 10\p@
+ {%
+ \setlength\parindent{\z@}%
+ \setlength\parskip {\z@}%
+ \ifnum
+ \c@secnumdepth >\m@ne
+ \par\nobreak
+ \vskip 10\p@
\fi
\Large \ChapFont \thechapter{} \space #1\par
\nobreak
\vskip 20\p@
- }}
+ }%
+ }
\def\@makeschapterhead#1{%
- {\setlength\parindent{\z@}%
- \setlength\parskip {\z@}%
- \Large \ChapFont #1\par
+ {%
+ \setlength\parindent{\z@}%
+ \setlength\parskip {\z@}%
+ \Large \ChapFont #1\par
\nobreak
\vskip 20\p@
- }}
+ }%
+ }
- \def\chapter{\clearpage
+ \def\chapter{%
+ \clearpage
\thispagestyle{plain}
\global\@topnum\z@
\@afterindentfalse
- \secdef\@chapter\@schapter}
-
- \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\@chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}{\protect
- \numberline{\thechapter}\bfseries #1}\else
- \addcontentsline{toc}{chapter}{\bfseries #1}\fi
- \chaptermark{#1}%
- \addtocontents{lof}%
- {\protect\addvspace{4\p@}}
- \addtocontents{lot}%
- {\protect\addvspace{4\p@}}
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else \@makechapterhead{#2}%
- \@afterheading
- \fi}
+ \secdef\@chapter\@schapter
+ }
+
+ \def\@chapter[#1]#2{%
+ \ifnum \c@secnumdepth
+ >\m@ne
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}{\protect
+ \numberline{\thechapter}\bfseries #1}
+ \else%
+ \addcontentsline{toc}{chapter}{\bfseries #1}
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}%
+ {\protect\addvspace{4\p@}}
+ \addtocontents{lot}%
+ {\protect\addvspace{4\p@}}
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi
+ }
%\def\@schapter#1{\if@twocolumn \@topnewpage[\@makeschapterhead{#1}]%
% \else \@makeschapterhead{#1}%
% \markright{#1}
% \@afterheading\fi}
+\fi
\def\section{\@startsection {section}{1}{\z@}{-3.5ex plus-1ex minus
-.2ex}{2.3ex plus.2ex}{\reset@font\large\bfseries}}
diff --git a/fithesis2.cls b/fithesis2.cls
index 0870336079bdb6280f660dbc0910be81bd79c737..fadcc21d59f6bf3403fb43c959dc97afb48fcc69 100644
--- a/fithesis2.cls
+++ b/fithesis2.cls
@@ -52,7 +52,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{oldfithesis2}[2015/02/03 old fithesis2 will load fithesis3 version 0.3.07 MU thesis class]
+\ProvidesClass{oldfithesis2}[2015/03/04 old fithesis2 will load fithesis3 version 0.3.08 MU thesis class]
\errmessage{%
You are using the fithesis2 class, which has been deprecated.
diff --git a/fithesis3.cls b/fithesis3.cls
index 877cf91ad28ba08e590f33c6fe8512f2f19903a7..de0a59933992df30f1620b9a839d4bfe069f2225 100644
--- a/fithesis3.cls
+++ b/fithesis3.cls
@@ -53,7 +53,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fithesis3}[2015/02/03 fithesis3 version 0.3.07 MU thesis class]
+\ProvidesClass{fithesis3}[2015/03/04 fithesis3 version 0.3.08 MU thesis class]
\ifx\clsclass\undefined
\def\clsclass{rapport3}
@@ -84,7 +84,7 @@
plainpages=false, % Multiple page numbering support
pdfpagelabels, % Generate pdf page labels
pdfcreator={% % PDF data stamping
- fithesis3 v0.3.07 MU thesis class%
+ fithesis3 v0.3.08 MU thesis class%
}
]{hyperref}
@@ -161,7 +161,7 @@
\def\Fi{fi}
\def\Sci{sci}
\def\Law{law}
-\def\Eco{eco}
+\def\Econ{econ}
\def\Fss{fss}
\def\Med{med}
\def\Ped{ped}
@@ -258,7 +258,7 @@
\else
\def\facultyname{Pr\'{a}vnick\'{a} fakulta}
\fi
- \else\ifx\@thesisfaculty\Eco
+ \else\ifx\@thesisfaculty\Econ
% The Faculty of Economics and Administration
\definecolor{faculty}{HTML}{7C211E} % Pantone 1815
\definecolor{facultylight}{HTML}{DAC1BF}
@@ -346,8 +346,8 @@ Prohla\v{s}uji, \v{z}e tato \expandafter\lowecasewrapper\@thesissubtitle{}
je m\'{y}m p\r{u}vodn\'{i}m autorsk\'{y}m
d\'{i}lem, kter\'{e} jsem vypracoval\@w\ samostatn\v{e}. V\v{s}echny zdroje, prameny a
literaturu, kter\'{e} jsem p\v{r}i vypracov\'{a}n\'{i} pou\v{z}\'{i}val\@w\ nebo z~nich
-\v{c}erpal\@w, v~pr\'{a}ci \v{r}\'{a}dn\v{e} cituji s~uveden\'{i}m \'{u}pln\'{e}ho odkazu na p\v{r}\'{i}slu\v{s}n\'{y}
-zdroj.}
+\v{c}erpal\@w, v~pr\'{a}ci \v{r}\'{a}dn\v{e} cituji s~uveden\'{i}m
+\'{u}pln\'{e}ho odkazu na p\v{r}\'{i}slu\v{s}n\'{y} zdroj.}
\def\DeclarationTextsk{%
Prehlasujem, \v{z}e t\'{a}to \expandafter\lowecasewrapper\@thesissubtitle{}
je moj\'{i}m p\^{o}vodn\'{y}m autorsk\'{y}m
@@ -357,9 +357,9 @@ literat\'{u}ru, ktor\'{e} som pri vypracovan\'{i} pou\v{z}\'{i}val\@w\ alebo z~n
zdroj.}
\def\DeclarationTexten{%
Hereby I declare, that this paper is my original authorial work,
-which I have worked out by my own. All sources, references and literature used or excerpted
-during elaboration of this work are properly cited and listed in complete reference to the due source.
-}
+which I have worked out by my own. All sources, references and
+literature used or excerpted during elaboration of this work
+are properly cited and listed in complete reference to the due source.}
\def\DeclarationTitlecs{%
Prohl\'{a}\v{s}en\'{i}
diff --git a/loga/Makefile b/loga/Makefile
index a095414463ed643af2dcee830e9cbd64c152531f..28b8b9f27800bd881c5e011d8e6ec225455d9d78 100644
--- a/loga/Makefile
+++ b/loga/Makefile
@@ -1,6 +1,6 @@
.PHONY: all
-all: eco-logo.pdf fsps-logo.pdf law-logo.pdf med-logo.pdf ped-logo.pdf phil-logo.pdf sci-logo.pdf fi-logo.pdf fss-logo.pdf
+all: econ-logo.pdf fsps-logo.pdf law-logo.pdf med-logo.pdf ped-logo.pdf phil-logo.pdf sci-logo.pdf fi-logo.pdf fss-logo.pdf
cd color; make all
%.pdf: %.eps
diff --git a/loga/color/Makefile b/loga/color/Makefile
index 12fa836266674c304a05e0ad81c62c1b4834f20d..a47404733dc3cfa1150521484a4b6f79c9033a48 100644
--- a/loga/color/Makefile
+++ b/loga/color/Makefile
@@ -1,6 +1,6 @@
.PHONY: all
-all: eco-logo.pdf fsps-logo.pdf law-logo.pdf med-logo.pdf ped-logo.pdf phil-logo.pdf sci-logo.pdf fi-logo.pdf fss-logo.pdf examples.pdf
+all: econ-logo.pdf fsps-logo.pdf law-logo.pdf med-logo.pdf ped-logo.pdf phil-logo.pdf sci-logo.pdf fi-logo.pdf fss-logo.pdf examples.pdf
%.pdf: %.eps
epstopdf $<
diff --git a/loga/color/eco-logo.eps b/loga/color/econ-logo.eps
similarity index 100%
rename from loga/color/eco-logo.eps
rename to loga/color/econ-logo.eps
diff --git a/loga/color/eco-logo.pdf b/loga/color/econ-logo.pdf
similarity index 100%
rename from loga/color/eco-logo.pdf
rename to loga/color/econ-logo.pdf
diff --git a/loga/eco-logo.eps b/loga/econ-logo.eps
similarity index 100%
rename from loga/eco-logo.eps
rename to loga/econ-logo.eps
diff --git a/loga/eco-logo.pdf b/loga/econ-logo.pdf
similarity index 100%
rename from loga/eco-logo.pdf
rename to loga/econ-logo.pdf