diff --git a/guide/mu/Makefile b/guide/mu/Makefile index 21804006c1ec3bb29d5a6c45165e17aeb0f87ae7..de0838ef52b402ead848fd489d2d978572c6ef63 100644 --- a/guide/mu/Makefile +++ b/guide/mu/Makefile @@ -1,6 +1,6 @@ PDFFILES=fi.pdf sci.pdf ped.pdf med.pdf fss.pdf fsps.pdf phil.pdf \ law.pdf econ.pdf -TEX=pdflatex -shell-escape +TEX=pdflatex --shell-escape .PHONY: all clean all: clean make all -C resources diff --git a/style/mu/base.dtx b/style/mu/base.dtx index 0d11a7c217a1bb8d4a849fdb6fd8536e6a9c79a8..5aa4e45066de3e17471792856c1ab17a75b7742e 100644 --- a/style/mu/base.dtx +++ b/style/mu/base.dtx @@ -908,14 +908,21 @@ % \end{macro}\begin{macro}{\thesis@blocks@assignment} % The |\thesis@blocks@assignment| macro produces a different output % depending on the values of the |\thesis@assignmentFiles|. -% |\ifthesis@blocks@assignment@|, and |\ifthesis@digital| macros. +% |\ifthesis@blocks@assignment@|, +% |\ifthesis@blocks@assignment@hideIfDigital@|, and +% |\ifthesis@digital| macros. % -% The default value of the \DescribeMacro{\ifthesis@blocks@assig^^A -% nment@}|\ifthesis@blocks@assignment@| conditional is +% The default value of the +% \DescribeMacro{\ifthesis@blocks@assignment@}^^A +% |\ifthesis@blocks@assignment@| and +% \DescribeMacro{\ifthesis@blocks@assignment@hideIfDigital}^^A +% |\ifthesis@blocks@assignment@hideIfDigital@| conditionals is % \texttt{true}. % \begin{macrocode} \newif\ifthesis@blocks@assignment@ \thesis@blocks@assignment@true +\newif\ifthesis@blocks@assignment@hideIfDigital@ +\thesis@blocks@assignment@hideIfDigital@true \def\thesis@blocks@assignment{% % \end{macrocode} % If the |\ifthesis@blocks@assignment@| conditional is @@ -932,37 +939,49 @@ \end{alwayssingle}% \else % \end{macrocode} +% Locally define \DescribeMacro{\@inject}|\@inject| as our routine +% for injecting lists of PDF documents. +% \begin{macrocode} + {\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}% +% \end{macrocode} % If the |\ifthesis@blocks@assignment@| conditional is % \textsf{true} and the |\thesis@assignmentFiles| macro is neither % undefined nor empty, then typeset a placeholder page, if the -% |\ifthesis@digital@| conditional is \textsf{true}. +% |\ifthesis@digital@| conditional is \textsf{true} and the +% |\ifthesis@blocks@assignmane@hideIfDigital@| conditional is +% \textsf{true} % \begin{macrocode} - {\edef\@pdfList{\thesis@assignmentFiles}% \ifx\@pdfList\empty\else \ifthesis@digital@ - \thesis@blocks@clear - \begin{alwayssingle}% - \thispagestyle{empty}\thesis@rewind - \noindent\textit{\thesis@@{assignment}}% - \end{alwayssingle}% + \ifthesis@blocks@assignment@hideIfDigital@ + \thesis@blocks@clear + \begin{alwayssingle}% + \thispagestyle{empty}\thesis@rewind + \noindent\textit{\thesis@@{assignment}}% + \end{alwayssingle}% % \end{macrocode} % If the |\ifthesis@blocks@assignment@| conditional is % \textsf{true} and the |\thesis@assignmentFiles| macro is neither % undefined nor empty, then inject the PDF documents specified in % the |\thesis@assignmentFiles|, if the |\ifthesis@digital@| -% conditional is \textsf{false}. +% conditional is \textsf{false} or the +% |\ifthesis@blocks@assignment@hideIfDigital@| conditional is +% \textsf{false}. % \begin{macrocode} + \else + \ea\@inject\@pdfList,\relax,% + \fi \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}% - % Rewind the pages and include the PDF. - \thesis@rewind\includepdf[pages=-]\@trimmed - \ea\@inject\fi}% \ea\@inject\@pdfList,\relax,% \fi \fi}% diff --git a/style/mu/sci.dtx b/style/mu/sci.dtx index 2cf808fd63fb54e84e0b03f9fe0c750db12ab406..f340073ae2e80ac7aa7046a9bfd166f5feb3c631 100644 --- a/style/mu/sci.dtx +++ b/style/mu/sci.dtx @@ -46,6 +46,11 @@ \thesis@blocks@assignment@false \fi\fi % \end{macrocode} +% Enable the inclusion of the scanned assignment inside the digital +% version of the document. +% \begin{macrocode} +\thesis@blocks@assignment@hideIfDigital@false +% \end{macrocode} % \begin{macro}{\thesis@blocks@bibEntry} % The |\thesis@blocks@bibEntry| macro typesets a % bibliographical entry. Along with the macros required by the diff --git a/test/mu/compare/Makefile b/test/mu/compare/Makefile index 475a9ad809304296162bdf8db84e8d7cc9febb22..f36301ca3f82a3fc430331bfb79c45cad62fed36 100644 --- a/test/mu/compare/Makefile +++ b/test/mu/compare/Makefile @@ -35,7 +35,13 @@ SOURCES=base-digital.tex base-printed.tex base-10pt.tex \ fi-digital-someassignment.tex fi-printed-emptyassignment.tex \ fi-printed-noassignment.tex \ fi-printed-someassignment-oneside.tex \ - fi-printed-someassignment-twoside.tex + fi-printed-someassignment-twoside.tex \ + sci-digital-emptyassignment.tex sci-digital-noassignment.tex \ + sci-digital-someassignment-oneside.tex \ + sci-digital-someassignment-twoside.tex \ + sci-printed-emptyassignment.tex sci-printed-noassignment.tex \ + sci-printed-someassignment-oneside.tex \ + sci-printed-someassignment-twoside.tex BIB_UNSOLICITED=econ-bibliography-unsolicited.tex \ fi-bibliography-unsolicited.tex \ fsps-bibliography-unsolicited.tex \ diff --git a/test/mu/compare/expected-sci-digital-emptyassignment-lualatex.pdf b/test/mu/compare/expected-sci-digital-emptyassignment-lualatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..d586e350ff69cd77d80b2ad3fd2797a8a3eb5ca9 Binary files /dev/null and b/test/mu/compare/expected-sci-digital-emptyassignment-lualatex.pdf differ diff --git a/test/mu/compare/expected-sci-digital-emptyassignment-pdflatex.pdf b/test/mu/compare/expected-sci-digital-emptyassignment-pdflatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..f620cb9f3a32bfe1d79ec8c76b527f7876eb3616 Binary files /dev/null and b/test/mu/compare/expected-sci-digital-emptyassignment-pdflatex.pdf differ diff --git a/test/mu/compare/expected-sci-digital-noassignment-lualatex.pdf b/test/mu/compare/expected-sci-digital-noassignment-lualatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..824775d0e29becbc2a6e2bba4122408afa303a2a Binary files /dev/null and b/test/mu/compare/expected-sci-digital-noassignment-lualatex.pdf differ diff --git a/test/mu/compare/expected-sci-digital-noassignment-pdflatex.pdf b/test/mu/compare/expected-sci-digital-noassignment-pdflatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..75f50ae5db70fbaa1e2654a6c39bb40e0f4796b5 Binary files /dev/null and b/test/mu/compare/expected-sci-digital-noassignment-pdflatex.pdf differ diff --git a/test/mu/compare/expected-sci-digital-someassignment-oneside-lualatex.pdf b/test/mu/compare/expected-sci-digital-someassignment-oneside-lualatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..4b47b4766ff40e9ba9ba5c16200f875309ad2dfd Binary files /dev/null and b/test/mu/compare/expected-sci-digital-someassignment-oneside-lualatex.pdf differ diff --git a/test/mu/compare/expected-sci-digital-someassignment-oneside-pdflatex.pdf b/test/mu/compare/expected-sci-digital-someassignment-oneside-pdflatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c443cfb20bc5c3773dddd27af65e8f75c0dd6953 Binary files /dev/null and b/test/mu/compare/expected-sci-digital-someassignment-oneside-pdflatex.pdf differ diff --git a/test/mu/compare/expected-sci-digital-someassignment-twoside-lualatex.pdf b/test/mu/compare/expected-sci-digital-someassignment-twoside-lualatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..27cf79ae319639d0a5a9870fa3d6d05fa8c25a8f Binary files /dev/null and b/test/mu/compare/expected-sci-digital-someassignment-twoside-lualatex.pdf differ diff --git a/test/mu/compare/expected-sci-digital-someassignment-twoside-pdflatex.pdf b/test/mu/compare/expected-sci-digital-someassignment-twoside-pdflatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..980065533f3265fe1185025a93c775ef17433115 Binary files /dev/null and b/test/mu/compare/expected-sci-digital-someassignment-twoside-pdflatex.pdf differ diff --git a/test/mu/compare/expected-sci-printed-emptyassignment-lualatex.pdf b/test/mu/compare/expected-sci-printed-emptyassignment-lualatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..e01f8521327742b742f90c160890d201cbe12e59 Binary files /dev/null and b/test/mu/compare/expected-sci-printed-emptyassignment-lualatex.pdf differ diff --git a/test/mu/compare/expected-sci-printed-emptyassignment-pdflatex.pdf b/test/mu/compare/expected-sci-printed-emptyassignment-pdflatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..b913ff5e1ddad730a735790627dd478d4025b894 Binary files /dev/null and b/test/mu/compare/expected-sci-printed-emptyassignment-pdflatex.pdf differ diff --git a/test/mu/compare/expected-sci-printed-noassignment-lualatex.pdf b/test/mu/compare/expected-sci-printed-noassignment-lualatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c7691ccf15c8c110a92460de36bea3938eb65df8 Binary files /dev/null and b/test/mu/compare/expected-sci-printed-noassignment-lualatex.pdf differ diff --git a/test/mu/compare/expected-sci-printed-noassignment-pdflatex.pdf b/test/mu/compare/expected-sci-printed-noassignment-pdflatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..9ce0be305ce8a0404975f8b4e90cc16195bc5643 Binary files /dev/null and b/test/mu/compare/expected-sci-printed-noassignment-pdflatex.pdf differ diff --git a/test/mu/compare/expected-sci-printed-someassignment-oneside-lualatex.pdf b/test/mu/compare/expected-sci-printed-someassignment-oneside-lualatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..1f56b622b425f924e6b016553c836cb07dc53a88 Binary files /dev/null and b/test/mu/compare/expected-sci-printed-someassignment-oneside-lualatex.pdf differ diff --git a/test/mu/compare/expected-sci-printed-someassignment-oneside-pdflatex.pdf b/test/mu/compare/expected-sci-printed-someassignment-oneside-pdflatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..fa272b09ba7cdc398f75963103a11eb7d3a5532b Binary files /dev/null and b/test/mu/compare/expected-sci-printed-someassignment-oneside-pdflatex.pdf differ diff --git a/test/mu/compare/expected-sci-printed-someassignment-twoside-lualatex.pdf b/test/mu/compare/expected-sci-printed-someassignment-twoside-lualatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..43415e7cd3a19e1f779bb6a230b317d97ecd3df6 Binary files /dev/null and b/test/mu/compare/expected-sci-printed-someassignment-twoside-lualatex.pdf differ diff --git a/test/mu/compare/expected-sci-printed-someassignment-twoside-pdflatex.pdf b/test/mu/compare/expected-sci-printed-someassignment-twoside-pdflatex.pdf new file mode 100644 index 0000000000000000000000000000000000000000..3ecc775865527f29d96f9424afc556df3b301c07 Binary files /dev/null and b/test/mu/compare/expected-sci-printed-someassignment-twoside-pdflatex.pdf differ diff --git a/test/mu/compare/sci-digital-emptyassignment.tex b/test/mu/compare/sci-digital-emptyassignment.tex new file mode 100644 index 0000000000000000000000000000000000000000..4e07fffdcc538c91a4a154e0a33613f0a6145071 --- /dev/null +++ b/test/mu/compare/sci-digital-emptyassignment.tex @@ -0,0 +1,6 @@ +\documentclass[digital]{fithesis3} +\thesissetup{ + faculty = sci, + assignment = {}} +\begin{document} +\end{document} diff --git a/test/mu/compare/sci-digital-noassignment.tex b/test/mu/compare/sci-digital-noassignment.tex new file mode 100644 index 0000000000000000000000000000000000000000..fdea4cc4a5a8c1ce8441adcfa9b8ef54dd6c9c08 --- /dev/null +++ b/test/mu/compare/sci-digital-noassignment.tex @@ -0,0 +1,4 @@ +\documentclass[digital]{fithesis3} +\thesissetup{faculty = sci} +\begin{document} +\end{document} diff --git a/test/mu/compare/sci-digital-someassignment-oneside.tex b/test/mu/compare/sci-digital-someassignment-oneside.tex new file mode 100644 index 0000000000000000000000000000000000000000..b27c09632aabfe4acbb543b964f43572f87deaec --- /dev/null +++ b/test/mu/compare/sci-digital-someassignment-oneside.tex @@ -0,0 +1,6 @@ +\documentclass[digital,oneside]{fithesis3} +\thesissetup{% + faculty = sci, + assignment = {resources/blindtext, resources/blindtext}} +\begin{document} +\end{document} diff --git a/test/mu/compare/sci-digital-someassignment-twoside.tex b/test/mu/compare/sci-digital-someassignment-twoside.tex new file mode 100644 index 0000000000000000000000000000000000000000..495865fa7773e7b0f1d86a70dfb553823c258119 --- /dev/null +++ b/test/mu/compare/sci-digital-someassignment-twoside.tex @@ -0,0 +1,6 @@ +\documentclass[digital,twoside]{fithesis3} +\thesissetup{% + faculty = sci, + assignment = {resources/blindtext, resources/blindtext}} +\begin{document} +\end{document} diff --git a/test/mu/compare/sci-printed-emptyassignment.tex b/test/mu/compare/sci-printed-emptyassignment.tex new file mode 100644 index 0000000000000000000000000000000000000000..bd6524e24e9fd062da256955545a962833b64136 --- /dev/null +++ b/test/mu/compare/sci-printed-emptyassignment.tex @@ -0,0 +1,6 @@ +\documentclass[printed]{fithesis3} +\thesissetup{ + faculty = sci, + assignment = {}} +\begin{document} +\end{document} diff --git a/test/mu/compare/sci-printed-noassignment.tex b/test/mu/compare/sci-printed-noassignment.tex new file mode 100644 index 0000000000000000000000000000000000000000..f8a45e7097a02286fea2c6bb2dfbaba527807469 --- /dev/null +++ b/test/mu/compare/sci-printed-noassignment.tex @@ -0,0 +1,4 @@ +\documentclass[printed]{fithesis3} +\thesissetup{faculty = sci} +\begin{document} +\end{document} diff --git a/test/mu/compare/sci-printed-someassignment-oneside.tex b/test/mu/compare/sci-printed-someassignment-oneside.tex new file mode 100644 index 0000000000000000000000000000000000000000..ae2506d2758bd735e0d105568d59055c27101833 --- /dev/null +++ b/test/mu/compare/sci-printed-someassignment-oneside.tex @@ -0,0 +1,6 @@ +\documentclass[printed,oneside]{fithesis3} +\thesissetup{% + faculty = sci, + assignment = {resources/blindtext, resources/blindtext}} +\begin{document} +\end{document} diff --git a/test/mu/compare/sci-printed-someassignment-twoside.tex b/test/mu/compare/sci-printed-someassignment-twoside.tex new file mode 100644 index 0000000000000000000000000000000000000000..97895896b05757d5dad15cb9de1b2b69820bccb7 --- /dev/null +++ b/test/mu/compare/sci-printed-someassignment-twoside.tex @@ -0,0 +1,6 @@ +\documentclass[printed,twoside]{fithesis3} +\thesissetup{% + faculty = sci, + assignment = {resources/blindtext, resources/blindtext}} +\begin{document} +\end{document}