From 6ab2dd239d277e6bb279b95090d6168f897d93af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Louren=C3=A7o?= Date: Sat, 9 Jan 2021 01:14:45 +0000 Subject: [PATCH] Fixes #135: add support for Erasmus Mundus MSc on Geospacial Technologies enhancement. Fixes #136. Fixes #137. --- NOVAthesisFiles/options.tex | 3 ++- README.md | 2 +- novathesis.cls | 40 ++++++++++++++++++++++++++++-------- template.pdf | Bin 1567703 -> 1567703 bytes template.tex | 10 +++++---- 5 files changed, 41 insertions(+), 14 deletions(-) diff --git a/NOVAthesisFiles/options.tex b/NOVAthesisFiles/options.tex index 7d10b25b..7865af6a 100644 --- a/NOVAthesisFiles/options.tex +++ b/NOVAthesisFiles/options.tex @@ -79,7 +79,7 @@ , docdegree/.new choice = {phd, phdprop, phdplan, msc, mscplan, bsc}, , school/.new choice = {{nova/fct}, {nova/fcsh}, {nova/ims}, {nova/ensp}, {ul/ist}, {ul/fc}, {ipl/isel}, {ips/ests}, {esep}, - {iscte-iul/ista}} + {iscte-iul/ista}, {consortium/msc-gt}} , docstatus/.new choice = {final, provisional, draft, working}, , docstatus = final, , chapstyle/.new choice = {bianchi, bluebox, default, elegant, @@ -96,6 +96,7 @@ , coverlang/.new choice = {en, pt, fr, it} , copyrightlang/.new choice = {en, pt, fr, it} , printcommittee/.new toggle = true + , printcopyright/.new toggle = true , secondcover/.new toggle = false , aftercover/.new toggle = false , urlstyle/.new cmd = {% diff --git a/README.md b/README.md index b714d0bb..a9d660c2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![NOVAthesis logo](NOVAthesisFiles/Images/novathesis-logo.jpg) # novathesis LaTeX template -%% Version 2021-01-03 [5.1.12] +%% Version 2021-01-09 [5.2.1] -------- diff --git a/novathesis.cls b/novathesis.cls index 6c48b465..7f3e7ef8 100644 --- a/novathesis.cls +++ b/novathesis.cls @@ -8,7 +8,7 @@ %% To view a copy of this license, visit %% https://www.latex-project.org/lppl/lppl-1-3c/ %% -%% Version 2021-01-03 [5.1.12] +%% Version 2021-01-09 [5.2.1] %% Departamento de Informática (www.di.fct.unl.pt) %% Faculdade de Ciências e Tecnologia (www.fct.unl.pt) %% Universidade NOVA de Lisboa (www.unl.pt) @@ -616,7 +616,7 @@ % \typeout{NT thecovertitle [#1]} \ifstrempty{#1}% {\thedoccovertitle(\option{/novathesis/coverlang})}% - {\thedoccovertitlecaps[\option{/novathesis/coverlang}]} + {\thedoccovertitlecaps(\option{/novathesis/coverlang})} } \newcommand{\thetitle}[1][\option{/novathesis/coverlang}]{% @@ -631,11 +631,14 @@ \newcommand{\nttitle}[2][\option{/novathesis/coverlang}]{% % \typeout{NT nttitle [#1] [#2]} - \doccovertitle(#1):={#2}% - \doccovertitlecaps(#1):={\expandafter\MakeTextUppercase\expandafter{#2}}% \saveexpandmode\noexpandarg% set \noexpandarg locally \StrSubstitute[0]{#2}{\\}{ }[\@thetitle]% + \StrSubstitute[0]{#2}{\\}{\newline}[\@thetitleii]% + % \def\@thetitleiii{\expandafter\MakeUppercase\expandafter{\@thetitleii}} + % \StrSubstitute[0]{\@thetitleiii}{@}{\newline}[\@thetitleiv]% \restoreexpandmode% restore the previous mode + \doccovertitle(#1):={#2}% + \doccovertitlecaps(#1):={\expandafter\MakeUppercase\expandafter{\@thetitleii}}% \doctitle(#1):=\@thetitle% \ifthenelse{\equal{#1}{\option{/novathesis/coverlang}}}{% \AtBeginDocument{% @@ -721,6 +724,27 @@ #1% } +\newcommand{\ntprintadvisersgroup}[2][0.90]{% + % #1 = width + % %2 = {adviser,coadviser} + \ifoptiondefined{/@nt/#2//name}{% + \bgroup + \csuse{the#2strfont}(\option{/novathesis/coverlang})% + \csuse{the#2str}(\option{/novathesis/coverlang})\\[1ex]% + \egroup + \begin{minipage}[t]{#1\linewidth}% + \centering + \optionlistdo{/@nt/#2//name}{\@nt@printadvisersgroup##1,\@nil}% + \end{minipage}% + }% + {\ClassWarning{novathesis}{option[/@nt/#1//name] undefined}}% +} + +\def\@nt@printadvisersgroup#1,#2\@nil{% + #1\\ + \IfEq{#2}{}{\medskip}{\@nt@printadvisersgroup#2\@nil}% +} + \newcommand{\ntprintadvisers}[1][0.90]{% \begin{minipage}{#1\textwidth} % #1 = Percentage of \textwidth used by the advisers list @@ -1081,10 +1105,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newcommand{\ntprintcopyright}{% \ifmaindoc{% THEN - \ntprintcopyrightpage% - }{% ELSE - % do nothing - }% + \iftoggle{/novathesis/printcopyright}% + {\ntprintcopyrightpage}% + {}% + }{}% } \newcommand{\ntprintcopyrightpage}{% diff --git a/template.pdf b/template.pdf index d94d44ad6d8b4732f5aa2b95554345741e1577b5..ca1aa9f0c8286085b72b65092bf2ff03f6fd9ae1 100644 GIT binary patch delta 156 zcmcb9J^uRj_=Xn77N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw z7O^ej$FH(m8Wr#@YV*s`w2~XCo6=CubK^V`oc8Q&UGrLo+i&a{~(# ZCsP+oOG9T@Gdl$vLQ1x?JrKXh4FEu7E$#pS delta 156 zcmcb9J^uRj_=Xn77N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQ7NHj57LgXw z7O^ej$FH)R8k!ke7?@5!cU4>r#@YV*s`w2~XJcnGQx|7*BWD8xGfO8k6H6BpM+*}- ZCj%n`CubK+XFCNOLQ1x?JrKXh4FE-_E))O& diff --git a/template.tex b/template.tex index a0f06892..ca36efae 100644 --- a/template.tex +++ b/template.tex @@ -7,7 +7,7 @@ %% To view a copy of this license, visit %% https://www.latex-project.org/lppl/lppl-1-3c/ %% -%% Version 2021-01-03 [5.1.12] +%% Version 2021-01-09 [5.2.1] %% Departamento de Informática (www.di.fct.unl.pt) %% Faculdade de Ciências e Tecnologia (www.fct.unl.pt) %% Universidade NOVA de Lisboa (www.unl.pt) @@ -68,13 +68,13 @@ %%------------------------------------------------------------ %% THE MOST IMPORTANT/POPULAR OPTIONS %%------------------------------------------------------------ -% \ntsetup{docdegree=msc} % The type od document +% \ntsetup{docdegree=msc} % The type of document % % [ phd, phdplan, phdprop, msc, mscplan, bsc ] -% \ntsetup{school=iscte-iul/ista} % The school id +% \ntsetup{school=nova/fcsh} % The school id % % [ nova/fct, nova/fcsh, nova/ims, nova/ensp, % % ul/ist, ul/fc, ipl/isel, ips/ests, esep, -% % iscte-iul/ista ] +% % iscte-iul/ista, consortium/msc-gt ] % \ntsetup{docstatus=working} % The status of the document % % [ final, provisional, draft, working ] @@ -99,6 +99,8 @@ % % under work/evaluation. Only final versions % % should have the list of committee memebers. +% \ntsetup{printcopyright=fale} % Should the copyright message be printed?? + % \ntsetup{secondcover=true} % Should a second cover page be printed? % % if the contents for the second page are not % % defined, the second cover will be a replica