diff --git a/latex/abstract.tex b/latex/abstract.tex
index 528d613f20511fa7416308aea51ceac1be311a33..338c27d99e842d2884f95b0bfb979dc4a7f1484c 100644
--- a/latex/abstract.tex
+++ b/latex/abstract.tex
@@ -8,7 +8,7 @@ Tarkempia ohjeita tiivistelmäsivun laadintaan läytyy opiskelijan yleisoppaasta
josta alla lyhyt katkelma.
Bibliografisten tietojen jälkeen kirjoitetaan varsinainen tiivistelmä.
-Sen on oletettava, että lukijalla on yleiset tiedot aiheesta. Tiivistelmän
+Sen on oletetta\-va, että lukijalla on yleiset tiedot aiheesta. Tiivistelmän
tulee olla ymmärrettävissä ilman tarvetta perehtyä koko tutkielmaan.
Se on kirjoitettava täydellisinä virkkeinä, väliotsakeluettelona.
On käytettävä vakiintuneita termejä. Viittauksia ja lainauksia tiivistelmään
diff --git a/latex/johdanto.tex b/latex/johdanto.tex
index 516ad2cee2996478d7a3ae38974327781b0b406f..16e76bcf02f01642654d15f670744031084e1f58 100644
--- a/latex/johdanto.tex
+++ b/latex/johdanto.tex
@@ -51,7 +51,7 @@ ja jopa jonkinlaisen horoskoopin.
Uutta testamenttia Agricola käänsi Wittenbergissä apuneuvoinaan kaksi
latinalaista, kaksi saksalaista ja kaksi ruotsalaista käännöstä. Se
-Wsi Testamenti ilmestyi 1548. Kirjan sanasto ja muoto-oppi on siinä
+Wsi Testamenti il\-mestyi 1548. Kirjan sanasto ja muoto-oppi on siinä
määrin epäyhtenäistä, että on arveltu, että käännöksellä on Agricolan
lisäksi ollut myös muita viimeistelijöitä.
diff --git a/latex/kuvat/nailgun.pdf b/latex/kuvat/nailgun.pdf
index ceb4bc557038c24549f344e93f843f2ee3b4d3cd..12ad2639d52c676732e9055ce7a8e19ebc14f463 100644
Binary files a/latex/kuvat/nailgun.pdf and b/latex/kuvat/nailgun.pdf differ
diff --git a/latex/kuvat/proguard.pdf b/latex/kuvat/proguard.pdf
index ff195868ec77a90c47c832df494387838e9be555..9c38fe1a077d29eef592c18e93595832bcd67352 100644
Binary files a/latex/kuvat/proguard.pdf and b/latex/kuvat/proguard.pdf differ
diff --git a/latex/thesis.pdf b/latex/thesis.pdf
index 0e691dcd4df28705a5911b2d0dae2fcd91c9f250..4c25880508aa6c740c96014651a4f0b7fc09d875 100644
Binary files a/latex/thesis.pdf and b/latex/thesis.pdf differ
diff --git a/latex/thesis.tex b/latex/thesis.tex
index b561b7ebfbc081a8d66dd3051161679d34a93208..3f51c75ba97931f73a6a576a533a0366a283fddd 100644
--- a/latex/thesis.tex
+++ b/latex/thesis.tex
@@ -1,50 +1,33 @@
-%% LyX 2.3.3 created this file. For more info, see http://www.lyx.org/.
-%% Do not edit unless you really know what you are doing.
-\documentclass[language=finnish,version=final,mainfont=none,sharelatex=false,hidechapters=true,countbibpages=false,emptyfirstpages=true]{utuftthesis}
+% Document template suitable for use as a LaTeX master-file for master's
+% thesis in University of Turku Department of Future Technologies.
+
+% HOW TO USE? See https://ttweb.utugit.fi/thesis/doc/overview/
+
+\documentclass[language=finnish,version=final,mainfont=none,sharelatex=false]{utuftthesis}
\setcounter{secnumdepth}{2}
\setcounter{tocdepth}{2}
\usepackage{float}
+\usepackage[caption=false]{subfig}
-\makeatletter
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands.
+% Define the algorithm environment
+%\makeatletter
\providecommand\textquotedblplain{%
\bgroup\addfontfeatures{Mapping=}\char34\egroup}
-%% Because html converters don't know tabularnewline
\providecommand{\tabularnewline}{\\}
\floatstyle{ruled}
\newfloat{algorithm}{tbp}{loa}
\providecommand{\algorithmname}{Algoritmi}
\floatname{algorithm}{\protect\algorithmname}
-
-\@ifundefined{showcaptionsetup}{}{%
- \PassOptionsToPackage{caption=false}{subfig}}
-\usepackage{subfig}
-\makeatother
-
-\renewcommand{\listingscaption}{Ohjelmalistaus}
+%\makeatother
\addbibresource{Bibliografia.bib}
-\begin{document}
-\begin{comment}
-Document template suitable for use as a LaTeX master-file for master's
-thesis in University of Turku Department of Future Technologies.\\
-\\
-Compatible with: ShareLaTeX, pdfLaTeX, LuaLaTeX, XeLaTeX, LyX, latexmk.
-The document class is described in utuftthesis.cls.\\
-\\
-HOW TO USE? See https://gitlab.utu.fi/ttweb/thesis
-\end{comment}
+\begin{document}
\pubyear{2019}
-
\pubmonth{6}
-
\publab{Labran nimi}
-
\publaben{Laboratory Name}
-
\pubtype{tkk}
\title{Name of Thesis}
\author{My Name}
@@ -52,10 +35,6 @@ HOW TO USE? See https://gitlab.utu.fi/ttweb/thesis
\maketitle
\input{abstract.tex}
-% empty pagestyle for table of contents etc.
-% otherwise you'll get simple page style with roman page numbers
-\pagestyle{empty}
-
% mandatory
\tableofcontents
@@ -69,18 +48,11 @@ HOW TO USE? See https://gitlab.utu.fi/ttweb/thesis
\listofacronyms
% change the name if the default doesn't sound right
-\renewcommand{\algorithmname}{Ohjelmalistaus}% 'list of X'
-% - it is also possible to define custom lists
-% \chapter{List Of Xs}
-% - the secnumdepth trickery is needed because acronyms are as a
-% standard chapter and we are faking '\listofacronyms'
-%
-%\setcounter{secnumdepth}{-1}
-%\input{your acronym chapter's file name}
-%\setcounter{secnumdepth}{2}% setup page numbering, page counter, etc.%
-\begin{comment}
-The thesis starts here.
+\renewcommand{\algorithmname}{\listingscaption}
+% The thesis starts here.
+
+\begin{comment}
To better organize things, create a new tex file for each chapter
and input it below.
@@ -95,9 +67,8 @@ Good luck!
%\input{file_name_of_chapter_x}
%\input{file_name_of_chapter_y}
-\begin{comment}
-The thesis main content ends here.
-\end{comment}
+% The thesis main content ends here.
+
\printbibliography
\begin{comment}
@@ -133,7 +104,7 @@ instance Monad IO where ... -- omitted
\newpage{}
-Ensimmäisen liitteen toinen sivu. Ohjelmakoodi \ref{alg:Monadin-k=0000E4ytt=0000F6=0000E4.}
+Ensimmäisen liitteen toinen sivu. Ohjelmalistaus \ref{alg:Monadin-kayttoa}
demonstroi vielä monadin käyttöä.
\begin{algorithm}[tbh]
@@ -145,7 +116,7 @@ putStr >>=
\n -> putStrLn ("Hey " ++ n)
\end{minted}
-\caption{Monadin käyttöä.\label{alg:Monadin-k=0000E4ytt=0000F6=0000E4.}}
+\caption{Monadin käyttöä.\label{alg:Monadin-kayttoa}}
\end{algorithm}
diff --git a/latex/utuftthesis.cls b/latex/utuftthesis.cls
index 491f55cbacf2cccb835b5d2f095d525dc2082425..78faaf43985c7cbd4dc887b17e3840457559048c 100644
--- a/latex/utuftthesis.cls
+++ b/latex/utuftthesis.cls
@@ -47,6 +47,7 @@
\DeclareStringOption[draft]{version} % draft/final version
\DeclareStringOption[a4paper]{paper} % @see ctan/macros/latex/base/classes, 3.1 Setting Paper Size
\DeclareStringOption[finnish]{language} % document's main language
+\DeclareStringOption[ieee]{bibstyle} % document's bibliography style
\DeclareStringOption[-1]{pagecountdelta} % workaround for bugs in the app page count
\DeclareStringOption[a-2b,mathxmp]{pdfaconformance} % PDF-A conformance level (a-1b, a-2b, a-2u, a-3b, a-3u, or 'none')
\DeclareStringOption[split]{biburlbreak} % how to handle long urls in bibliography ('ragged', 'split', or 'none')
@@ -59,6 +60,8 @@
\DeclareBoolOption[false]{minted} % use minted instead of listings (must enable -shell-escape!)
\DeclareBoolOption[true]{emptyfirstpages} % hide the header/footer of the first page of each chapter
\DeclareBoolOption[true]{turnitinchecked} % turnitin text
+\DeclareBoolOption[false]{turnitinnewpage} % turnitin text on a new page
+\DeclareBoolOption[false]{hidetocpagenum} % hide the roman page numbers in toc / lists
%% Process given options
@@ -211,7 +214,6 @@
%% some more suggestions
%\RequirePackage[l2tabu, orthodox]{nag} % checks whether outdated latex features are being used
%\RequirePackage[all,warning]{onlyamsmath}
-%\RequirePackage{sverb} % enhanced handling of verbatim stuff
%\RequirePackage{titlecaps} % capitalized words in titles
%\RequirePackage{microtype}
%\RequirePackage{amssymb}
@@ -231,19 +233,20 @@
\setcounter{biburllcpenalty}{7000}
\setcounter{biburlucpenalty}{8000}
}{}
+
+%% bibliography, new engine
\ifdefstring{\utuftthesis@biburlbreak}{ragged}{
- \RequirePackage[style=ieee,backend=biber,block=ragged]{biblatex} % bibliography, new engine
+ \RequirePackage[style=\utuftthesis@bibstyle,backend=biber,block=ragged]{biblatex}
}
{
- \RequirePackage[style=ieee,backend=biber]{biblatex} % bibliography, new engine
+ \RequirePackage[style=\utuftthesis@bibstyle,backend=biber]{biblatex}
}
-\RequirePackage{fvextra} % minted
+\RequirePackage{fvextra} % minted
\RequirePackage{csquotes} % quotations
\RequirePackage{datetime2} % month names
-
%% !! Update these only if the document's main language is not finnish or english !!
\newcommand{\ye@r}{\the\year}
\newcommand{\m@nth}{\the\month}
@@ -413,17 +416,17 @@
%% the first abstract
\langfin{
- \renewenvironment{abstract}{\expandafter\@bstracth\expandafter{\n@tivelang}}{\expandafter\@bstractt\expandafter{\n@tivelang}{\k@ywords}}
+ \renewenvironment{abstract}{\expandafter\@bstracth\expandafter{\n@tivelang}{1}}{\expandafter\@bstractt\expandafter{\n@tivelang}{\k@ywords}}
%% the second abstract environment
%% always in english - but can be omitted if the document uses a single language
- \newenvironment{abstracten}{\@bstracth{english}}{\@bstractt{english}{\k@ywordstwo}}
+ \newenvironment{abstracten}{\@bstracth{english}{2}}{\@bstractt{english}{\k@ywordstwo}}
}{
- \renewenvironment{abstract}{\@bstracth{english}}{\@bstractt{english}{\k@ywords}}
+ \renewenvironment{abstract}{\@bstracth{english}{1}}{\@bstractt{english}{\k@ywords}}
%% the second abstract environment
%% always in english - just an alias for 'abstract'
- \newenvironment{abstracten}{\@bstracth{english}}{\@bstractt{english}{\k@ywords}}
+ \newenvironment{abstracten}{\@bstracth{english}{1}}{\@bstractt{english}{\k@ywords}}
}
\newcommand\lastapppage{\zref@extractdefault{appendices}{abspage}{999}}
@@ -439,7 +442,10 @@
%% title page, reuses the standard \maketitle
\renewcommand*{\maketitle}{%
- \clearpage
+ %\clearpage
+ \begin{titlepage}
+ \setcounter{page}{0}
+ \pagenumbering{alph}
\thispagestyle{empty}
\vspace*{\stretch{1}}
\vspace{3mm}
@@ -468,22 +474,31 @@
\end{adjustbox}
\vspace*{\stretch{1}}%
\ifutuftthesis@turnitinchecked
- \\
- \scriptsize \turnitin
+ \ifutuftthesis@turnitinnewpage
+ \newpage
+ \thispagestyle{empty}
+ \vspace*{\stretch{1}}
+ \else
+ \\
+ \fi
+ \scriptsize \noindent{\turnitin}
\fi
+ \end{titlepage}
\renewcommand{\baselinestretch}{1.655}\normalsize
\clearpage
}
%% top part of the abstract page (since we use environments)
-\newcommand{\@bstracth}[1]{%
+\newcommand{\@bstracth}[2]{%
\selectlanguage{#1}
\setlength{\headheight}{0 pt}
\setlength{\headsep}{0 pt}
\addtolength\topmargin{-0.54 cm}
\renewcommand{\baselinestretch}{1}\normalsize
\clearpage
+ \pagenumbering{alph}
+ \addtocounter{page}{#2}
\thispagestyle{empty}
\noindent
\begin{minipage}[\textheight]{\linewidth}
@@ -510,7 +525,6 @@
\end{entry}
\end{minipage}
\clearpage
- \setcounter{page}{0}
\setlength{\headheight}{12 pt}
\setlength{\headsep}{24 pt}
\setlength{\topmargin}{0 mm}
@@ -528,6 +542,12 @@
%% now optional
\newcommand{\startpages}{\initdocstyle}
+\newcommand{\inittocstyle}{%
+ \ifutuftthesis@hidetocpagenum
+ \fancypagestyle{plain}{\fancyhf{}\renewcommand{\headrulewidth}{0 pt}}
+ \fi
+}
+
%% initializes the settings for main document content
\newcommand{\initdocstyle}{%
\renewcommand{\startpages}{}
@@ -539,7 +559,7 @@
\clearpage
% clear 1st page headers/footers per request
\ifutuftthesis@emptyfirstpages
- \fancypagestyle{plain}{\fancyhf{}\renewcommand{\headrulewidth}{0 pt}}
+ \fancypagestyle{plain}{\fancyhf{}\renewcommand{\headrulewidth}{0 pt}}
\fi
\pagenumbering{arabic}
\setcounter{page}{1}
@@ -554,7 +574,7 @@
}
%% postpone the doc style through these sections
-\pretocmd{\tableofcontents}{\renewcommand{\startpages}{}}{}{}
+\pretocmd{\tableofcontents}{\renewcommand{\startpages}{}\inittocstyle}{}{}
\apptocmd{\tableofcontents}{\renewcommand{\startpages}{\initdocstyle}}{}{}
\pretocmd{\listoffigures}{\renewcommand{\startpages}{}}{}{}
\apptocmd{\listoffigures}{\renewcommand{\startpages}{\initdocstyle}}{}{}