diff options
author | Karl Berry <karl@freefriends.org> | 2015-12-03 22:46:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-12-03 22:46:34 +0000 |
commit | 86cc950723f91a5018990b9fb405dd0dc96803e4 (patch) | |
tree | ac5be1e5acbd0fb214ea2407290853d58de67267 /Master/texmf-dist | |
parent | 01bb97b7cce21d16ac4b2b953469cd66236d58a2 (diff) |
fithesis (3dec15)
git-svn-id: svn://tug.org/texlive/trunk@39009 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
34 files changed, 68 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf Binary files differindex e22dc58628f..4727a778b84 100644 --- a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf Binary files differindex c6aa3bc8165..060ce93f46d 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf Binary files differindex 051632ba276..8c5ebddeefe 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf Binary files differindex 0d3ddb95ab8..a114d8edbf8 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf Binary files differindex 979fb282f79..1ecd3e3d5bb 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf Binary files differindex b1aeb8e25d9..a7ffceea04f 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf Binary files differindex e8aae52a362..f43221961e0 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf Binary files differindex 2abc77889b5..cfed3ada35e 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf Binary files differindex 4c63f59e761..a178014cfda 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf Binary files differindex d8c9ad6c165..20ab53498b7 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index a021a9f62a9..a43090d1a51 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -51,11 +51,21 @@ %<*class> \NeedsTeXFormat{LaTeX2e} % Define `\thesis@version` and store it in the `VERSION.tex` file \fi -\def\thesis@version{2015/11/30 v0.3.27 fithesis3 MU thesis class} +\def\thesis@version{2015/12/03 v0.3.28 fithesis3 MU thesis class} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \changes{v0.3.28:2}{2015/12/03}{If the thesis locale and the +% document locale is the same (the default behaviour), the +% \cs{thesis@selectLocale} macro is applied globally at the +% beginning of the document. As a result, the \textsf{csquotes} +% style is automatically set for the entire document. [VN]} +% \changes{v0.3.28:1}{2015/12/02}{The \texttt{draft} option has no +% longer an effect on the \textsf{microtype} package. The +% \cs{thesis@require} command now also takes an optional +% argument and the \cs{thesis@requireWithOption} command has +% become \cs{thesis@requireIfExists}. [VN]} % \changes{v0.3.27:5}{2015/11/30}{The PDF bookmarks are no longer % garbled, when the \Hologo{LuaTeX} engine is used. [VN]} % \changes{v0.3.27:4}{2015/11/30}{\cs{thesis@english@declaration} @@ -1176,12 +1186,31 @@ \thesis@loadedtrue \makeatletter% % \end{macrocode} -% First, the main locale file is loaded using the -% |\thesis@requireLocale| macro. If the user specified an explicit -% empty string as the value of |\thesis@locale|, do nothing. +% First, the name of the main locale file is fully expanded and +% loaded using the |\thesis@requireLocale| macro. If the user +% specified an explicit empty string as the value of +% |\thesis@locale|, do nothing. % \begin{macrocode} \ifx\thesis@locale\empty\else + \edef\thesis@locale{\thesis@locale} \thesis@requireLocale{\thesis@locale} +% \end{macrocode} +% If the \textsf{babel} or \textsf{polyglossia} locale is identical +% to the thesis locale, the |\thesis@selectLocale| macro will be +% used to globally set up the \textsf{csquotes} style appropriate for +% the given locale. +% \begin{macrocode} + \ifx\languagename\empty\else + \begingroup + \edef\@doclocale{\languagename}% + \ifx\@doclocale\thesis@locale + \endgroup + \AtBeginDocument{% + \thesis@selectLocale{\thesis@locale}}% + \else + \endgroup + \fi + \fi \fi % \end{macrocode} % Consequently, the style files are loaded. If the user specified an @@ -1242,20 +1271,20 @@ \thesis@exists{#1}{\input{#1}}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@require} -% The |\thesis@require| \marg{package} expands to -% |\RequirePackage|\marg{package}, if the specified +% The |\thesis@require|\oarg{options}\marg{package} expands to +% |\RequirePackage|\oarg{options}\marg{package}, if the specified % \textit{package} has not yet been loaded. % \begin{macrocode} -\def\thesis@require#1{% - \@ifpackageloaded{#1}{}{\RequirePackage{#1}}} +\newcommand\thesis@require[2][]{% + \@ifpackageloaded{#2}{}{\RequirePackage[#1]{#2}}} % \end{macrocode} -% \end{macro}\begin{macro}{\thesis@requireWithOptions} -% The |\thesis@requireWithOptions|\marg{package} expands to -% |\RequirePackageWithOptions|\marg{package}, if the specified -% \textit{package} exists and has not yet been loaded. +% \end{macro}\begin{macro}{\thesis@requireIfExists} +% The |\thesis@requireIfExists|\oarg{options}\marg{package} expands +% to |\thesis@require|\oarg{options}\marg{package}, if the +% specified \textit{package} exists and has not yet been loaded. % \begin{macrocode} -\def\thesis@requireWithOptions#1{\thesis@exists{#1.sty}{% - \@ifpackageloaded{#1}{}{\RequirePackageWithOptions{#1}}}} +\newcommand\thesis@requireIfExists[2][]{% + \thesis@exists{#2.sty}{\thesis@require[#1]{#2}}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@requireStyle} % If inheritance is enabled for style files, then the @@ -1272,11 +1301,11 @@ % \begin{macrocode} \def\thesis@requireStyle#1{% \ifthesis@style@inheritance% - \thesis@requireWithOptions{\thesis@stylepath fithesis-base}% - \thesis@requireWithOptions{\thesis@stylepath\thesis@university% + \thesis@requireIfExists{\thesis@stylepath fithesis-base}% + \thesis@requireIfExists{\thesis@stylepath\thesis@university% /fithesis-base} \fi% - \thesis@requireWithOptions{\thesis@stylepath#1}} + \thesis@requireIfExists{\thesis@stylepath#1}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@requireLocale} % If inheritance is enabled for style files, then the diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx index 244ef9c683b..2ed2a361ebf 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -160,7 +160,7 @@ % \textsf{microtype} package gets loaded. % \begin{macrocode} \ifthesis@microtype@ - \thesis@require{microtype} + \thesis@require[final,babel]{microtype} \fi % \end{macrocode} % Using the |\ifxetex| and |\ifluatex| conditionals, a compound diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls index 107a9b1662c..a6af90032ee 100644 --- a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls +++ b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\def\thesis@version{2015/11/30 v0.3.27 fithesis3 MU thesis class} +\def\thesis@version{2015/12/03 v0.3.28 fithesis3 MU thesis class} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesClass{fithesis3}[\thesis@version] @@ -333,7 +333,19 @@ \thesis@loadedtrue \makeatletter% \ifx\thesis@locale\empty\else + \edef\thesis@locale{\thesis@locale} \thesis@requireLocale{\thesis@locale} + \ifx\languagename\empty\else + \begingroup + \edef\@doclocale{\languagename}% + \ifx\@doclocale\thesis@locale + \endgroup + \AtBeginDocument{% + \thesis@selectLocale{\thesis@locale}}% + \else + \endgroup + \fi + \fi \fi \ifx\thesis@style\empty\else \thesis@requireStyle{\thesis@style} @@ -357,17 +369,17 @@ \ClassWarning{fithesis3}{File #1 doesn't exist}}} \def\thesis@input#1{% \thesis@exists{#1}{\input{#1}}} -\def\thesis@require#1{% - \@ifpackageloaded{#1}{}{\RequirePackage{#1}}} -\def\thesis@requireWithOptions#1{\thesis@exists{#1.sty}{% - \@ifpackageloaded{#1}{}{\RequirePackageWithOptions{#1}}}} +\newcommand\thesis@require[2][]{% + \@ifpackageloaded{#2}{}{\RequirePackage[#1]{#2}}} +\newcommand\thesis@requireIfExists[2][]{% + \thesis@exists{#2.sty}{\thesis@require[#1]{#2}}} \def\thesis@requireStyle#1{% \ifthesis@style@inheritance% - \thesis@requireWithOptions{\thesis@stylepath fithesis-base}% - \thesis@requireWithOptions{\thesis@stylepath\thesis@university% + \thesis@requireIfExists{\thesis@stylepath fithesis-base}% + \thesis@requireIfExists{\thesis@stylepath\thesis@university% /fithesis-base} \fi% - \thesis@requireWithOptions{\thesis@stylepath#1}} + \thesis@requireIfExists{\thesis@stylepath#1}} \def\thesis@requireLocale#1{% % Ignore redundant requests \expandafter\ifx\csname thesis@#1@required\endcsname\relax% diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf Binary files differindex bdb3dcd141b..79b72780687 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf Binary files differindex 42d9a10d03c..d37fdb81b16 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf Binary files differindex e88b5eb9272..8cffa4bf698 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf Binary files differindex a2fb4d23c5f..16b92f8e668 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf Binary files differindex 633df970d86..81c4473e5e9 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf Binary files differindex 5f0dcee41cc..f316e7a93ac 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf Binary files differindex 9a2813ea90e..ec8a3aaa0eb 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf Binary files differindex 6b8ee5c13ac..b51653a6e38 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf Binary files differindex 83476fda2b1..5e3b8616b37 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf Binary files differindex 2e963877d59..b92bba358aa 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf Binary files differindex e97f8410854..5374132285b 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf Binary files differindex bdd5dc179bd..4c03d0b2d32 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf Binary files differindex 65f2d0a844f..a4d3e131033 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf Binary files differindex 8de0f3cdd17..9dee18f24c6 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf Binary files differindex 091a916c1b2..8feaa1a7967 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf Binary files differindex 6776bb91f0e..7dd95fe7d41 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf Binary files differindex 0aa05a5a0bc..4bd3411ec1c 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf Binary files differindex c58516eeaff..10b7989a3e9 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf Binary files differindex 706a4f96c4f..0f5a3d324bb 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf Binary files differindex c1071b91f16..098cabbff61 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty index 8fcf5a164c9..64e22dbb4ab 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty @@ -93,7 +93,7 @@ \thesis@require{ifxetex} \thesis@require{ifluatex} \ifthesis@microtype@ - \thesis@require{microtype} + \thesis@require[final,babel]{microtype} \fi {\let\x\expandafter \x\global\x\let\x\ifthesis@xeluatex\csname if% |