diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-06 23:02:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-06 23:02:55 +0000 |
commit | 6257b52105585a7cdd3a20b33339c06c9ac4cb86 (patch) | |
tree | 52ab292ff62b1c51b9b60112fdd16b5ea67d8aa5 /Master/texmf-dist/tex/latex/fithesis/style | |
parent | 014c6b54a7b6e4171f80da6ce77c6f11ae8a1a75 (diff) |
fithesis (6jun16)
git-svn-id: svn://tug.org/texlive/trunk@41303 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fithesis/style')
-rw-r--r-- | Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty | 56 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty | 3 |
2 files changed, 41 insertions, 18 deletions
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 ccb1c020c46..4d73c932634 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 @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/06/06] \NeedsTeXFormat{LaTeX2e} \DeclareOption{10pt}{\def\thesis@ptsize{0}} \DeclareOption{11pt}{\def\thesis@ptsize{1}} @@ -82,8 +82,13 @@ \newif\ifthesis@cover@ \DeclareOption{nocover}{\thesis@cover@false} \DeclareOption{cover}{\thesis@cover@true} -\DeclareOption{digital}{\ExecuteOptions{color,cover}} -\DeclareOption{printed}{\ExecuteOptions{monochrome,nocover}} +\newif\ifthesis@digital@ +\DeclareOption{digital}{% + \ExecuteOptions{color,cover}% + \thesis@digital@true} +\DeclareOption{printed}{% + \ExecuteOptions{monochrome,nocover}% + \thesis@digital@false} \ExecuteOptions{% printed,12pt,twoside,final,microtype,palatino,oldtable,lot,lof} \ProcessOptions* @@ -416,31 +421,47 @@ \par\vfil\null \end{alwayssingle}}% \fi} +\def\thesis@rewind{% + \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}} \newif\ifthesis@blocks@assignment@ \thesis@blocks@assignment@true +\newif\ifthesis@blocks@assignment@hideIfDigital@ +\thesis@blocks@assignment@hideIfDigital@true \def\thesis@blocks@assignment{% \ifthesis@blocks@assignment@ \ifx\thesis@assignmentFiles\undefined - % Typeset a placeholder page. + % Rewind the pages and typeset a placeholder page. \thesis@blocks@clear \begin{alwayssingle}% - \thispagestyle{empty}% - \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}% + \thispagestyle{empty}\thesis@rewind \noindent\textit{\thesis@@{assignment}}% \end{alwayssingle}% \else {\edef\@pdfList{\thesis@assignmentFiles}% + \let\ea\expandafter + % Injects the specified PDF documents. + \def\@inject##1,{\thesis@blocks@clear + \def\@args{##1}\def\@relax{\relax}% + \ifx\@args\@relax\else + % Trim leading spaces. + \edef\@trimmed{\romannumeral-`\.##1}% + % Rewind the pages and include the PDF. + \thesis@rewind\includepdf[pages=-]\@trimmed + \ea\@inject\fi}% \ifx\@pdfList\empty\else - \let\ea\expandafter - % Inject the specified PDF documents. - \def\@inject##1,{\thesis@blocks@clear - \def\@args{##1}\def\@relax{\relax}% - \ifx\@args\@relax\else - % Trim leading spaces. - \edef\@trimmed{\romannumeral-`\.##1}% - \includepdf[pages=-]\@trimmed - \ea\@inject\fi}% - \ea\@inject\@pdfList,\relax,% + \ifthesis@digital@ + \ifthesis@blocks@assignment@hideIfDigital@ + \thesis@blocks@clear + \begin{alwayssingle}% + \thispagestyle{empty}\thesis@rewind + \noindent\textit{\thesis@@{assignment}}% + \end{alwayssingle}% + \else + \ea\@inject\@pdfList,\relax,% + \fi + \else + \ea\@inject\@pdfList,\relax,% + \fi \fi}% \fi \fi} @@ -462,7 +483,8 @@ \ifthesis@bibliography@loaded@ \ifthesis@bibliography@included@\else \thesis@blocks@clear - \printbibliography[heading=bibintoc]% + {\emergencystretch=3em% + \printbibliography[heading=bibintoc]}% \fi \fi} \setcounter{tocdepth}{2} diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty index 0252d38f26e..3b3fefce043 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/05/15] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/06/06] \thesis@color@setup{ links={HTML}{20E366}, tableEmph={HTML}{8EDEAA}, @@ -67,6 +67,7 @@ \ifx\thesis@type\thesis@masters\else \thesis@blocks@assignment@false \fi\fi +\thesis@blocks@assignment@hideIfDigital@false \def\thesis@blocks@bibEntry{% \begin{alwayssingle}% {% Start the new chapter without clearing the right page |