Merge branch 'master' into novacek/paragraph-section

.gitlab-ci.yml

@@ -24,32 +24,4 @@ XeLaTeX:
         paths:
             - ctufit-thesis.pdf
             - ctufit-thesis-en.pdf
-            - ctufit-thesis-sk.pdf
-
-pdfLaTeX:
-    script: 
-        - sed 's/\[czech/\[slovak/' ctufit-thesis.tex > ctufit-thesis-sk.tex
-        - sed 's/\[czech/\[english/' ctufit-thesis.tex > ctufit-thesis-en.tex
-        - latexmk -pdf ctufit-thesis.tex
-        - latexmk -pdf ctufit-thesis-en.tex
-        - latexmk -pdf ctufit-thesis-sk.tex
-    artifacts:
-        paths:
-            - ctufit-thesis.pdf
-            - ctufit-thesis-en.pdf
-            - ctufit-thesis-sk.pdf
-
-LaTeX:
-    script: 
-        - DEBIAN_FRONTEND=noninteractive apt-get update
-        - DEBIAN_FRONTEND=noninteractive apt-get -yq install ghostscript
-        - sed 's/\[czech/\[slovak/' ctufit-thesis.tex > ctufit-thesis-sk.tex
-        - sed 's/\[czech/\[english/' ctufit-thesis.tex > ctufit-thesis-en.tex
-        - latexmk -pdfps ctufit-thesis.tex
-        - latexmk -pdfps ctufit-thesis-en.tex
-        - latexmk -pdfps ctufit-thesis-sk.tex
-    artifacts:
-        paths:
-            - ctufit-thesis.pdf
-            - ctufit-thesis-en.pdf
-            - ctufit-thesis-sk.pdf
+            - ctufit-thesis-sk.pdf
\ No newline at end of file

README.md

@@ -7,7 +7,12 @@ LaTeX template for theses at FIT CTU
 About
 -----
-Recommended template for theses submitted at [Faculty of Information Technology](https://fit.cvut.cz) at [Czech Technical University in Prague](https://cvut.cz). For use with LaTeX 2e (pdfLaTeX, XeLaTeX, LuaLaTeX).
+Recommended template for theses submitted at [Faculty of Information Technology](https://fit.cvut.cz) at [Czech Technical University in Prague](https://cvut.cz). For use with XeLaTeX or LuaLaTeX.
+
+
+Version
+--------
+1.3.1, built 17. 6. 2024. The whole changelog can be found in the [Changelog file](changelog.md).
 Bugs and support

changelog.md

+
+# Changelog
+All notable changes to this project will be documented in this file.
+ 
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.3.1] - 17. 6. 2024
+  
+Improvements of frontmatter, table of contents entries and sectioning.
+ 
+### Changed
+- Changed order of front matter entries (acknowledgements, dedications, etc.) to match standard sectioning.
+- Excluding frontmatter entries from table of contents.
+
+### Fixed
+- Fixed missing empty page after titlepage.
+- Fixed numbering/toc of subsubsection.
+
+
+## [1.3.0] - 17. 6. 2024
+  
+Dropped older compilers that do not support computer-read PDFs (e.g., the text could not be copy-pasted). Now, only XeLaTeX and LuaLaTeX can be used.
+ 
+### Changed
+- Changed the if that processes the used compiler, so it supports only XeLaTex or LuaLaTeX. Otherwise, error is raised.
+
+
+
+## [1.2.2] - 17. 6. 2024
+  
+Title page is now first, the assignment is second page.
+ 
+### Changed
+- Swapped Title page and assignment page.
+
+
+
+## [1.2.1] - 17. 6. 2024
+  
+Sync of layout for oneside and twoside versions. 
+ 
+### Changed
+- The introduction chapter is numbered (as it should have been).
+
+### Fixed
+- Fixed the problem that oneside and twoside versions had different layouts because of different margings.
+
+
+
+## [1.2.0] - 17. 6. 2024
+  
+Started versioning.
+
+### Added
+- Version number of the project.
+- This changelog file.
\ No newline at end of file

ctufit-thesis.cls

@@ -61,7 +61,7 @@
 \LoadClass[a4paper,11pt]{book}[2020/04/10]
 \RequirePackage{babel}[2021/03/03]
 \if@twoside
-    \RequirePackage[bottom=4cm,footskip=4em]{geometry}[2020/01/02] %page layout
+    \RequirePackage[top=4.6cm,bottom=4cm,footskip=4em,inner=4.7cm,outer=3.25cm]{geometry}[2020/01/02] %page layout
 \else
     \RequirePackage[left=3.95cm,right=4.0cm,top=4.6cm,bottom=4cm,footskip=4em]{geometry}[2020/01/02] %page layout
 \fi
@@ -281,10 +281,15 @@
 \def\frontsubsectionfont{\large}
 \def\frontsubsubsectionfont{\bfseries}
-\setcounter{secnumdepth}{5} % numbering sections; 5: paragraph
-\setcounter{tocdepth}{5} % table of content depth; 5: paragraph
-% frontmatter headings end
+\setcounter{secnumdepth}{4} % numbering sections; 4: paragraph
+\newcommand{\stopTOCentries}{
+  \addtocontents{toc}{\protect\setcounter{tocdepth}{-1}}
+}
+\newcommand{\resumeTOCentries}{
+  \addtocontents{toc}{\protect\setcounter{tocdepth}{4}} % table of content depth; 3: paragraph
+}
+% frontmatter headings end
 % frontmatter pseudochapters: named part without printing actual chapter heading
 % \makeatletter
 \newcommand{\frontchapternotprinted}[1]{%

ctufit-thesis.tex

 %% This is the ctufit-thesis example file. It is used to produce theses
 %% for submission to Czech Technical University, Faculty of Information Technology.
 %%
+%% This is version 1.3.1, built 17. 6. 2024.
+%% 
 %% Get the newest version from
 %% https://gitlab.fit.cvut.cz/theses-templates/FITthesis-LaTeX
 %%
@@ -67,8 +69,7 @@
 \iftutex % XeLaTeX and LuaLaTeX
     \RequirePackage{ellipsis}[2020/05/22] %ellipsis workaround for XeLaTeX
 \else
-    \RequirePackage[utf8]{inputenc}[2018/08/11] %this file encoding
-    \RequirePackage{lmodern}[2009/10/30] % vector flavor of Computer Modern font
+    \errmessage{Only compilation with XeLaTeX or LuaLaTeX is allowed}
 \fi
 % hyperlinks
@@ -107,23 +108,12 @@
 \begin{document} 
 \frontmatter\frontmatterinit % do not remove these two commands
-\includepdf[pages={1-}]{assignment-include.pdf} % replace that file with your thesis assignment provided by study office
-\thispagestyle{empty}\cleardoublepage\maketitle % do not remove these three commands
+\thispagestyle{empty}\maketitle\thispagestyle{empty}\cleardoublepage % do not remove these four commands
+\includepdf[pages={1-}]{assignment-include.pdf} % replace this file with your thesis assignment generated from ProjectsFIT
 \imprintpage % do not remove this command
-
-\tableofcontents % do not remove this command
-%%%%%%%%%%%%%%%%%%%%%%
-% list of other contents: figures, tables, code listings, algorithms, etc.
-% add/remove commands accordingly
-%%%%%%%%%%%%%%%%%%%%%%
-\listoffigures % list of figures
-\begingroup
-\let\clearpage\relax
-\listoftables % list of tables
-\thectufitlistingscommand
-\endgroup
+\stopTOCentries
 %%%%%%%%%%%%%%%%%%%%%%
 % list of other contents END
 %%%%%%%%%%%%%%%%%%%%%%
@@ -190,6 +180,18 @@ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur sagittis hen
 % SUMMARY END
 %%%%%%%%%%%%%%%%%%%
+\tableofcontents % do not remove this command
+%%%%%%%%%%%%%%%%%%%%%%
+% list of other contents: figures, tables, code listings, algorithms, etc.
+% add/remove commands accordingly
+%%%%%%%%%%%%%%%%%%%%%%
+\listoffigures % list of figures
+\begingroup
+\let\clearpage\relax
+\listoftables % list of tables
+\thectufitlistingscommand
+\endgroup
+
 %%%%%%%%%%%%%%%%%%%
 % ABBREVIATIONS
 % FILL IN / MODIFY
@@ -212,9 +214,8 @@ W3C & World Wide Web Consortium
 %%%%%%%%%%%%%%%%%%%
 % ABBREVIATIONS END
 %%%%%%%%%%%%%%%%%%%
-
+\resumeTOCentries
 \mainmatter\mainmatterinit % do not remove these two commands
-
 %%%%%%%%%%%%%%%%%%%
 % THE THESIS
 % MODIFY ANYTHING BELOW THIS LINE

text/text.tex

 % Do not forget to include Introduction
 %---------------------------------------------------------------
-% \chapter{Introduction}
+\chapter{Introduction}
 % uncomment the following line to create an unnumbered chapter
-\chapter*{Introduction}\addcontentsline{toc}{chapter}{Introduction}\markboth{Introduction}{Introduction}
+%\chapter*{Introduction}\addcontentsline{toc}{chapter}{Introduction}\markboth{Introduction}{Introduction}
 %---------------------------------------------------------------
 \setcounter{page}{1}