Rename to academic year and fix example

niknetniko · Nov 23, 2019 · 987d604 · 987d604
1 parent 25b5d10
commit 987d604
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 18 deletions.
diff --git a/example.tex b/example.tex
@@ -11,17 +11,24 @@
 %% example.tex
 %% Shows how to use the UGent 2016 styles. See the manuel for more information.
 %%
-\documentclass[11pt,campus=default,faculty=we,layout=all,dutch]{ugent2016-book}
 
+% Alternative classes are ugent2016-book or ugent2016-article
+\documentclass[11pt,dutch,faculty=we,layout=titlefont]{ugent2016-report}
+% The layout parameter controls how much of the UGent layout we want to apply.
+% Currently we apply as much as possible, but see the manual for more information.
+% Note that this will not set the main font of your text; this is something you must
+% do yourself (the style guide recommends either UGent Panno Tekst or Arial).
+
+% Babel for language facilities.
 \usepackage{babel}
-% Provide example text
+% Provide example text.
 \usepackage{lipsum}
 
 % Some meta data. See the manual for an overview for everything.
 \author{Jan Jaap}
 \title{Supermooie cursus die een hele lange titel heeft}
 %\subtitle{Hello}
-\academyyear{2018--2019}
+\academicyear{2018--2019}
 \programme{Informatica}
 \wordcount{10000}
 \studentnumber{12356}

diff --git a/latex/ugent2016-en.tex b/latex/ugent2016-en.tex
@@ -269,7 +269,7 @@
                 \verb|\author{}| & Like standard \LaTeX. \\
                 \verb|\title{}|  & Liek standard \LaTeX. \\
                 \verb|\subtitle{}| & Like standard \KOMAScript. \\
-                \verb|\academyyear{}| & The academic year, e.g.\ 2017 – 2018. \\
+                \verb|\academicyear{}| & The academic year, e.g.\ 2017 – 2018. \\
                 \verb|\programme{}| & The education programme, e.g.\ Computer Science. \\
                 \verb|\wordcount{}| & Number of words in the document. \\
                 \verb|\studentnumber{}| & Student number. \\

diff --git a/latex/ugent2016-nl.tex b/latex/ugent2016-nl.tex
@@ -269,7 +269,7 @@
                 \verb|\author{}| & Zoals in standaard-\LaTeX. \\
                 \verb|\title{}|  & Zoals standaard-\LaTeX. \\
                 \verb|\subtitle{}| & Zoals standaard-\KOMAScript. \\
-                \verb|\academyyear{}| & Het academiejaar, bv. 2017 – 2018. \\
+                \verb|\academicyear{}| & Het academiejaar, bv. 2017 – 2018. \\
                 \verb|\programme{}| & De richting, bv. Informatica. \\
                 \verb|\wordcount{}| & Aantal woorden in het werk. \\
                 \verb|\studentnumber{}| & Studentennummer. \\

diff --git a/latex/ugent2016-title-course.tex b/latex/ugent2016-title-course.tex
@@ -15,7 +15,7 @@
 \author{Prof. Dr. Achternaam}
 \title{Title in UGent Panno Text SEMIBOLD 35 PT}
 \subtitle{Vak}
-\academyyear{Academiejaar 20.. - 20..}
+\academicyear{Academiejaar 20.. - 20..}
 \programme{Opleiding}
 
 \begin{document}

diff --git a/latex/ugent2016-title-notes.tex b/latex/ugent2016-title-notes.tex
@@ -17,7 +17,7 @@
 \titletext{titletext}
 \title{title}
 \subtitle{subtitle}
-\academyyear{academyyear}
+\academicyear{academicyear}
 \programme{programme}
 \wordcount{wordcount}
 \studentnumber{studentnumber}

diff --git a/latex/ugent2016-title-report.tex b/latex/ugent2016-title-report.tex
@@ -16,7 +16,7 @@
 \titletext{titletext}
 \title{title}
 \subtitle{subtitle}
-\academyyear{academyyear}
+\academicyear{academicyear}
 \programme{programme}
 \wordcount{wordcount}
 \studentnumber{studentnumber}

diff --git a/latex/ugent2016-title.sty b/latex/ugent2016-title.sty
@@ -116,7 +116,7 @@
 
 % Define front page attributes.
 % See the manual for a description and the intended use.
-\newcommand*{\@academyyear}{}
+\newcommand*{\@academicyear}{}
 \newcommand*{\@programme}{}
 \newcommand*{\@studentnumber}{}
 \newcommand*{\@wordcount}{}
@@ -133,7 +133,7 @@
 % Create the command that will make them available to the package.
 \newcommand*{\professor}[1]{\author{#1}}
 \newcommand*{\programme}[1]{\gdef\@programme{#1}}
-\newcommand*{\academyyear}[1]{\gdef\@academyyear{#1}}
+\newcommand*{\academicyear}[1]{\gdef\@academicyear{#1}}
 \newcommand*{\studentnumber}[1]{\gdef\@studentnumber{#1}}
 \newcommand*{\wordcount}[1]{\gdef\@wordcount{#1}}
 \newcommand*{\titletext}[1]{\gdef\@titletext{#1}}
@@ -172,8 +172,8 @@
 	\NewTranslation{english}{wordcounttext}{Word count:}
 	\NewTranslationFallback{numbertext}{Studentennummer:}
 	\NewTranslation{english}{numbertext}{Student number:}
-	\NewTranslationFallback{academyyear}{Academiejaar:}
-	\NewTranslation{english}{academyyear}{Academic year:}
+	\NewTranslationFallback{academicyear}{Academiejaar:}
+	\NewTranslation{english}{academicyear}{Academic year:}
 
 	% For the course title page, we differ slightly from the Word templates; our title page is aligned to the grid,
 	% theirs is not.
@@ -246,8 +246,8 @@
 				}
 
 				\vspace{1\baselineskip}
-				\ifdefempty{\@academyyear}{}{%
-					\noindent{\GetTranslation{academyyear} \@academyyear}
+				\ifdefempty{\@academicyear}{}{%
+					\noindent{\GetTranslation{academicyear} \@academicyear}
 				}
 				\vspace{\fill}
 			\end{titlepage}
@@ -351,7 +351,7 @@
 						{\fontsize{18bp}{22bp}\panno\@author} \par
 						\vspace{\smallblock}
 						{\fontsize{15bp}{18bp}\panno\@programme} \par
-						{\fontsize{15bp}{18bp}\panno\@academyyear}
+						{\fontsize{15bp}{18bp}\panno\@academicyear}
 					\end{minipage}
 					};
 				\end{tikzpicture}

diff --git a/lyx/ugent2016-common.inc b/lyx/ugent2016-common.inc
@@ -2,10 +2,10 @@
 # Base definitions for the UGent 2016 script layouts.
 # Niko Strijbol <[email protected]>, 2019/04/29.
 
-Style AcademyYear
-	LabelString		"Academy year (academiejaar)"
+Style AcademicYear
+	LabelString		"Academic year (academiejaar)"
 	CopyStyle		Author
-	LatexName		academyyear
+	LatexName		academicyear
 End
 
 Style Programme