Merge branch 'develop'

joaomlourenco · Apr 5, 2021 · 1c4143c · 1c4143c
2 parents a9cfbf8 + 615540f
commit 1c4143c
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 6,696 deletions.
diff --git a/Config/1_novathesis.tex b/Config/1_novathesis.tex
@@ -17,7 +17,7 @@
 %                               %     [ phd, phdplan, phdprop, msc, mscplan, bsc, plain ]
 %                               % DEFAULT: docdegree=msc
 
-\ntsetup{school=uminho/ee}     % The school id
+% \ntsetup{school=uminho/ee}     % The school id
 %                               %     [ nova/fct, nova/fcsh, nova/ims, nova/ensp, 
 %                               %       ul/ist, ul/fc, ipl/isel, ips/ests, esep,
 %                               %       iscte-iul/ista, consortium/msc-gt, nova/fct-legacy ]

diff --git a/NOVAthesisFiles/Schools/consortium/msc-gt/defaults.ldf b/NOVAthesisFiles/Schools/consortium/msc-gt/defaults.ldf
@@ -108,7 +108,7 @@
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
 % Title of Dissertation

diff --git a/NOVAthesisFiles/Schools/esep/defaults.ldf b/NOVAthesisFiles/Schools/esep/defaults.ldf
@@ -130,7 +130,7 @@
   \ntsetup{fontstyle=calibri}%
 }{%
   \NTAddToHook{cover/back/begin}{%
-    \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+    \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
   }%
 }
 

diff --git a/NOVAthesisFiles/Schools/ipl/isel/defaults.ldf b/NOVAthesisFiles/Schools/ipl/isel/defaults.ldf
@@ -171,7 +171,7 @@
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
 % LOGO

diff --git a/NOVAthesisFiles/Schools/ips/ests/defaults.ldf b/NOVAthesisFiles/Schools/ips/ests/defaults.ldf
@@ -171,7 +171,7 @@
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
 % LOGO

diff --git a/NOVAthesisFiles/Schools/iscte-iul/ista/defaults.ldf b/NOVAthesisFiles/Schools/iscte-iul/ista/defaults.ldf
@@ -162,7 +162,7 @@
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
 % LOGO

diff --git a/NOVAthesisFiles/Schools/nova/ensp/defaults.ldf b/NOVAthesisFiles/Schools/nova/ensp/defaults.ldf
@@ -126,7 +126,7 @@
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
 % ENSP logo

diff --git a/NOVAthesisFiles/Schools/nova/fcsh/defaults.ldf b/NOVAthesisFiles/Schools/nova/fcsh/defaults.ldf
@@ -119,7 +119,7 @@
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
 \definecolor{fcshblue}{RGB}{25,61,108}% Background title color

diff --git a/NOVAthesisFiles/Schools/nova/fct/defaults.ldf b/NOVAthesisFiles/Schools/nova/fct/defaults.ldf
@@ -118,7 +118,7 @@
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
 % Author name

diff --git a/NOVAthesisFiles/Schools/nova/ims/defaults.ldf b/NOVAthesisFiles/Schools/nova/ims/defaults.ldf
@@ -195,7 +195,7 @@ of the requirements for the degree of %
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
   % PHD PROGRAM

diff --git a/NOVAthesisFiles/Schools/ul/fc/defaults.ldf b/NOVAthesisFiles/Schools/ul/fc/defaults.ldf
@@ -197,7 +197,7 @@
 % Temporary macro to use in conditional expressions;
 
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
   \ifdocfinal{\provisionalstring(\option{/novathesis/coverlang}):={~}}{}%
 }
 

diff --git a/NOVAthesisFiles/Schools/ul/ist/defaults.ldf b/NOVAthesisFiles/Schools/ul/ist/defaults.ldf
@@ -167,7 +167,7 @@
 %% Draw the cover page
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NTAddToHook{cover/1/begin}{%
-  \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
 }
 
 % LOGO

diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/CAPA-Dissertacao-Mestrado-EE.ai b/NOVAthesisFiles/Schools/uminho/ee/Images/CAPA-Dissertacao-Mestrado-EE.ai
diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/EE-C-grey.pdf b/NOVAthesisFiles/Schools/uminho/ee/Images/EE-C-grey.pdf
diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/EE-C-um-grey.pdf b/NOVAthesisFiles/Schools/uminho/ee/Images/EE-C-um-grey.pdf
diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/EE-C-um-white.pdf b/NOVAthesisFiles/Schools/uminho/ee/Images/EE-C-um-white.pdf
diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/capa-debug.pdf b/NOVAthesisFiles/Schools/uminho/ee/Images/capa-debug.pdf
diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/capa2-debug.pdf b/NOVAthesisFiles/Schools/uminho/ee/Images/capa2-debug.pdf
diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/cover-examples.jpg b/NOVAthesisFiles/Schools/uminho/ee/Images/cover-examples.jpg
diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/cover-examples.pdf b/NOVAthesisFiles/Schools/uminho/ee/Images/cover-examples.pdf
diff --git a/NOVAthesisFiles/Schools/uminho/ee/Images/spine-debug.pdf b/NOVAthesisFiles/Schools/uminho/ee/Images/spine-debug.pdf
diff --git a/NOVAthesisFiles/Schools/uminho/ee/defaults.ldf b/NOVAthesisFiles/Schools/uminho/ee/defaults.ldf
@@ -344,11 +344,13 @@ indicada.\\[1ex]
 \newcommand*{\settextcolor}{%
   \if\@nt@covernumber1\relax%
     \ifphddoc{\color{\phdtextcolor}}{\color{\msctextcolor}}%
+  \else%
+    \color{covergrey}%
   \fi%
 }
 
 \NTAddToHook{cover/1/begin}{%
-  % \ifxeorlua{\setmainfont[Ligatures=TeX]{TeX Gyre Heros}}{\fontfamily{phv}}%
+  % \ifxeorlua{\setmainfont[Ligatures=TeX]{Helvetica}}{\fontfamily{phv}}%
   \ifphddoc{\pagecolor{covergrey}\color{\phdtextcolor}}{\pagecolor{white}\color{\msctextcolor}}%
 }
 
@@ -361,7 +363,6 @@ indicada.\\[1ex]
 
 \NTAddToHook{cover/2/begin}{%
   \pagecolor{white}%
-  \color{black}%
 }
 
 \NTAddToHook{cover/2/back}{%
@@ -384,12 +385,12 @@ indicada.\\[1ex]
 }
 
 % University and School logos
-\ntaddtocover[vspace=0cm,align=l,height=2.6cm]{1}{%
+\ntaddtocover[vspace=-0.6mm,align=l,height=2.6cm]{1}{%
   \includegraphics[height=2.5cm]{EE-C}%
 }
 
 % University and School logos
-\ntaddtocover[vspace=0cm,align=l,height=2.6cm]{2}{%
+\ntaddtocover[vspace=-0.6mm,,align=l,height=2.6cm]{2}{%
   \includegraphics[height=2.5cm]{EE-C-grey}%
 }
 

diff --git a/template.pdf b/template.pdf