Commit f16d9d73 authored by Vít Novotný's avatar Vít Novotný
Browse files

The locale macros `\thesis@<locale>@winter` and `\thesis@<locale>@summer` 

were renamed to `\thesis@<locale>@spring` and `\thesis@<locale>@fall`.

The semantics have also changed. The `\thesis@parseDate` macro no
longer sets `\thesis@season` to `winter` if `\thesis@month` < 7 and to
`summer` otherwise. Instead, the `\thesis@season` macro is set to
`spring` if 2 > `\thesis@month` < 9 and to `fall` otherwise.

The `\thesis@academicYear` macro is no longer set to
`\thesis@year`-1/`\thesis@year` if `\thesis@month` < 7 and to
`\thesis@year`/`\thesis@year`+1 otherwise. Instead, the
`\thesis@academicYear` macro is set to
`\thesis@year`-1/`\thesis@year` if `\thesis@month` < 9 and to
`\thesis@year`/`\thesis@year`+1 otherwise.

These changed month ranges reflect more accurately the beginning and the
end of the spring and fall semesters.
parent cec8ec1e

fithesis/fithesis.dtx

+25 −22
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ 
% \end{macro}

% \subsubsection{The \texttt{date} key}

% The \marg{\texttt{date}=date} pair sets the date of the thesis

% defence to \textit{date}, where \textit{date} is a string

% submission to \textit{date}, where \textit{date} is a string

% in the \texttt{YYYY/MM/DD} format, where \texttt{YYYY} stands

% for full year, \texttt{MM} stands for month and \texttt{DD}

% stands for day. The \textit{date} is parsed and stored using
@@ -808,40 +808,43 @@ 
%   \item\DescribeMacro{\thesis@season}|\thesis@season| -- Expands

%     to either:

%     \begin{itemize}

%       \item\texttt{winter} if \texttt{MM} $<7$.

%       \item\texttt{summer} if \texttt{MM} $\geq7$.

%       \item\texttt{spring} if $2>{}$\texttt{MM}${}<9$,

%       \item\texttt{fall} if $2\leq{}$\texttt{MM}${}\geq9$.

%     \end{itemize}

%   \item\DescribeMacro{\thesis@academicYear}|\thesis@academicYear|

%     -- The academic year of the given semester:

%     \begin{itemize}

%       \item\texttt{YYYY/YYYY}$+1$ in case of a summer semester

%       \item\texttt{YYYY}$-1$\texttt{/YYYY} in case of a winter

%            semester

%       \item\texttt{YYYY}${}-1$\texttt{/YYYY} if \texttt{MM}${}<9$.

%       \item\texttt{YYYY/YYYY}${}+1$ if \texttt{MM}${}\geq9$

%     \end{itemize}

% \end{itemize}

% To set up the default values, the |\thesis@parseDate| macro is

% called with the fully expanded |\the\year/\the\month/\the\day|

% string.

% string, which equals the current date.

%    \begin{macrocode}

\def\thesis@parseDate#1/#2/#3|{{

  % Basic info

  % Set the basic macros

  \gdef\thesis@date{#1/#2/#3}%

  \gdef\thesis@year{#1}%

  \gdef\thesis@month{#2}%

  \gdef\thesis@day{#3}%

  

  % Season and academic year

  \newcount\@year \expandafter\@year \thesis@year \relax%

  \newcount\@month\expandafter\@month\thesis@month\relax%

  \ifnum\@month<7%

    \gdef\thesis@season{winter}%

    \advance\@year-1\edef\@yearA{\the\@year}%

    \advance\@year 1\edef\@yearB{\the\@year}%

  \else%

    \gdef\thesis@season{summer}%

  % Set the season

  \newcount\@month\expandafter\@month\thesis@month\relax

       \ifnum\@month>8\gdef\thesis@season{fall}

  \else\ifnum\@month<3\gdef\thesis@season{fall}

  \else               \gdef\thesis@season{spring}

  \fi\fi



  % Set the academic year

  \newcount\@year\expandafter\@year\thesis@year\relax

  \ifnum\@month>8%

                    \edef\@yearA{\the\@year}%

    \advance\@year 1\edef\@yearB{\the\@year}%

  \fi%

  \else

    \advance\@year-1\edef\@yearA{\the\@year}%

    \advance\@year 1\edef\@yearB{\the\@year}%

  \fi

  \global\edef\thesis@academicYear{\@yearA/\@yearB}}}



\edef\thesis@date{\the\year/\the\month/\the\day}%
@@ -1411,10 +1414,10 @@ 
%     of the declaration section

%   \item|\thesis@|\textit{locale}|@idTitle| -- The title of the

%     thesis author's identifier field

%   \item|\thesis@|\textit{locale}|@winter| -- The name of the

%     winter semester

%   \item|\thesis@|\textit{locale}|@summer| -- The name of the

%     summer semester

%   \item|\thesis@|\textit{locale}|@spring| -- The name of the

%     spring semester

%   \item|\thesis@|\textit{locale}|@fall| -- The name of the

%     fall semester

%   \item|\thesis@|\textit{locale}|@semester| -- The full name of

%     the current semester

%   \item|\thesis@|\textit{locale}|@typeName| -- The name of the

fithesis/guide/mu/guide.dtx

+6 −6
Original line number Diff line number Diff line 
%<*guide>

%    \begin{macrocode}

\documentclass[color,table,cover,twoside,lot,lof]{../../fithesis3}

\documentclass[color,twoside,lot,lof]{../../fithesis3}

\usepackage[english]{babel}

\usepackage{hologo}

\usepackage{fancyvrb}

\usepackage{minted}

\usepackage{ltxcmds}

\usepackage{tabularx}

\usepackage{booktabs}

\usepackage[

  backend=biber,

  style=numeric,
@@ -388,12 +390,10 @@ 
%</sci>

      author=Jane Doe}

    \thesislong{abstract}{

      In this document, I am going to

      explore the craft of creating

      abstracts \ldots

      In this document, I am going to explore the craft of

      creating abstracts \ldots

        

      \ldots that span multiple

      paragraphs.}

      \ldots that span multiple paragraphs.}

    \begin{document}

      Hello world!

    \end{document}

fithesis/locale/czech.dtx

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 
\gdef\thesis@czech@thanksTitle{Poděkování}

\gdef\thesis@czech@declarationTitle{Prohlášení}

\gdef\thesis@czech@idTitle{ID}

\gdef\thesis@czech@winter{jaro}

\gdef\thesis@czech@summer{podzim}

\gdef\thesis@czech@spring{jaro}

\gdef\thesis@czech@fall{podzim}

\gdef\thesis@czech@semester{%

  \thesis@{czech@\thesis@season} \thesis@year}

\gdef\thesis@czech@typeName{%

fithesis/locale/english.dtx

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
% \iffalse

%<*base>

% \fi\begin{macrocode}

\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/06/26]

\ProvidesFile{fithesis/locale/fithesis-english.def}[2015/11/10]



% Placeholders

\gdef\thesis@english@universityName{University name}
@@ -22,8 +22,8 @@ 
\gdef\thesis@english@thanksTitle{Acknowledgement}

\gdef\thesis@english@declarationTitle{Declaration}

\gdef\thesis@english@idTitle{ID}

\gdef\thesis@english@winter{Spring}

\gdef\thesis@english@summer{Fall}

\gdef\thesis@english@spring{Spring}

\gdef\thesis@english@fall{Fall}

\gdef\thesis@english@semester{%

  \thesis@{english@\thesis@season} \thesis@year}

\gdef\thesis@english@typeName{%

fithesis/locale/slovak.dtx

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 
\gdef\thesis@slovak@thanksTitle{Poďakovanie}

\gdef\thesis@slovak@declarationTitle{Prehlásenie}

\gdef\thesis@slovak@idTitle{ID}

\gdef\thesis@slovak@winter{jar}

\gdef\thesis@slovak@summer{jeseň}

\gdef\thesis@slovak@spring{jar}

\gdef\thesis@slovak@fall{jeseň}

\gdef\thesis@slovak@semester{%

  \thesis@{slovak@\thesis@season} \thesis@year}

\gdef\thesis@slovak@typeName{%