From 804ed063151696ec3101ec58445e342c4dff43e5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 8 Jan 2016 00:05:15 +0000 Subject: fithesis (6jan16) git-svn-id: svn://tug.org/texlive/trunk@39309 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/fithesis/fithesis.dtx | 32 ++++++++++++++++++---- .../source/latex/fithesis/locale/czech.dtx | 4 +-- .../source/latex/fithesis/locale/english.dtx | 4 +-- .../source/latex/fithesis/locale/slovak.dtx | 4 +-- 4 files changed, 33 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index 794685f35d7..8274c601e39 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -17,6 +17,7 @@ \usepackage{microtype} \usepackage{ragged2e} \usepackage{paralist} +\usepackage{multicol} % Making paragraphs numbered \makeatletter @@ -51,11 +52,15 @@ %<*class> \NeedsTeXFormat{LaTeX2e} % Define `\thesis@version` and store it in the `VERSION.tex` file \fi -\def\thesis@version{2015/12/09 v0.3.29 fithesis3 MU thesis class} +\def\thesis@version{2015/01/05 v0.3.30 fithesis3 MU thesis class} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \changes{v0.3.30}{2015/01/05}{The \cs{thesis@seasonYear} macro +% has been added, which, unlike \cs{thesis@year} takes into +% account the fact that January and Fabruary of the year $n$ +% still belong to the fall semester of the year $n-1$.} % \changes{v0.3.29:3}{2015/12/09}{The \texttt{table} class option % for the style files of the Masaryk University in Brno now loads % all the required packages and changes the table measurements @@ -876,21 +881,31 @@ % stands for day. The \textit{date} is parsed and stored using % the \DescribeMacro{\thesis@parseDate}|\thesis@parseDate| % macro within the following macros: +% \begin{multicols}{2} % \begin{itemize} % \item\DescribeMacro{\thesis@date}|\thesis@date| -- The entire % \textit{date} % \item\DescribeMacro{\thesis@year}|\thesis@year| -- The -% \texttt{YYYY} part of \textit{date} +% \texttt{YYYY} of \textit{date} % \item\DescribeMacro{\thesis@month}|\thesis@month| -- The -% \texttt{MM} part of \textit{date} +% \texttt{MM} of \textit{date} % \item\DescribeMacro{\thesis@day}|\thesis@day| -- The -% \texttt{DD} part of \textit{date} +% \texttt{DD} of \textit{date} +% \end{itemize} +% \end{multicols} +% \begin{itemize} % \item\DescribeMacro{\thesis@season}|\thesis@season| -- Expands % to either: % \begin{itemize} % \item\texttt{spring} if $2<{}$\texttt{MM}${}<9$, % \item\texttt{fall} if \texttt{MM}${}\leq2$ or \texttt{MM}${}\geq9$. % \end{itemize} +% \item\DescribeMacro{\thesis@seasonYear}|\thesis@seasonYear| +% -- The year of the given semester: +% \begin{itemize} +% \item\texttt{YYYY}${}-1$ if \texttt{MM}${}\leq2$. +% \item\texttt{YYYY} if \texttt{MM}${}>2$ +% \end{itemize} % \item\DescribeMacro{\thesis@academicYear}|\thesis@academicYear| % -- The academic year of the given semester: % \begin{itemize} @@ -921,11 +936,18 @@ \ifnum\@month>8% \edef\@yearA{\the\@year}% \advance\@year 1\edef\@yearB{\the\@year}% + \advance\@year-1 \else \advance\@year-1\edef\@yearA{\the\@year}% \advance\@year 1\edef\@yearB{\the\@year}% \fi - \global\edef\thesis@academicYear{\@yearA/\@yearB}}} + \global\edef\thesis@academicYear{\@yearA/\@yearB} + + % Set the season year + \ifnum\@month>2\else + \advance\@year-1 + \fi + \global\edef\thesis@seasonYear{\the\@year}}} \edef\thesis@date{\the\year/\the\month/\the\day}% \expandafter\thesis@parseDate\thesis@date|% diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index 6a7c5f4a1a8..9a34e2402cd 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx @@ -2,7 +2,7 @@ % This is the base file of the Czech locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2015/11/29] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/01/05] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -41,7 +41,7 @@ \gdef\thesis@czech@spring{jaro} \gdef\thesis@czech@fall{podzim} \gdef\thesis@czech@semester{% - \thesis@{czech@\thesis@season} \thesis@year} + \thesis@{czech@\thesis@season} \thesis@seasonYear} \gdef\thesis@czech@typeName{% \ifx\thesis@type\thesis@bachelors% Bakalářská práce% diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx index d2ba335c242..15ffaadc04a 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx @@ -2,7 +2,7 @@ % This is the base file of the English locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/11/29] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/01/05] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -30,7 +30,7 @@ \gdef\thesis@english@spring{Spring} \gdef\thesis@english@fall{Fall} \gdef\thesis@english@semester{% - \thesis@{english@\thesis@season} \thesis@year} + \thesis@{english@\thesis@season} \thesis@seasonYear} \gdef\thesis@english@typeName{% \ifx\thesis@type\thesis@bachelors% Bachelor's Thesis% diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index 601affce036..5086ceead42 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx @@ -2,7 +2,7 @@ % This is the base file of the Slovak locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/11/29] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2015/01/05] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -41,7 +41,7 @@ \gdef\thesis@slovak@spring{jar} \gdef\thesis@slovak@fall{jeseň} \gdef\thesis@slovak@semester{% - \thesis@{slovak@\thesis@season} \thesis@year} + \thesis@{slovak@\thesis@season} \thesis@seasonYear} \gdef\thesis@slovak@typeName{% \ifx\thesis@type\thesis@bachelors% Bakalárska práca% -- cgit v1.2.3