Merge branch 'develop'

joaomlourenco · Oct 25, 2024 · 3f4b4b0 · 3f4b4b0
2 parents 69b2320 + dc05a17
commit 3f4b4b0
Show file tree

Hide file tree

Showing 10 changed files with 167 additions and 42 deletions.
diff --git a/Chapters/Figures/google-logo.pdf b/Chapters/Figures/google-logo.pdf
diff --git a/Config/1_novathesis.tex b/Config/1_novathesis.tex
@@ -26,12 +26,13 @@
 %                               % DEFAULT: doctype=phd
 
 % \ntsetup{school=uminho/eeng}    % The school id
-%                               %     [ nova/fct, nova/blue, nova/green, nova/brown, nova/red, 
+%                               %     [ nova/fct, nova/fct/di-adc,
+%                               %       nova/fct/blue, nova/fct/green, nova/fct/brown, nova/fct/red,
 %                               %       nova/itqb/gray, nova/itqb/green, nova/fcsh, nova/ensp, 
 %                               %       nova/ims, nova/ims/csig, nova/ims/ddm, nova/ims/dsaa,
 %                               %       nova/ims/egi, nova/ims/gi, nova/ims/gt, 
 %                               %       ulisboa/ist, ulisboa/fc, ulisboa/fmv, ulisboa/iseg,
-%                               %       uminho/eaad, uminho/ese, uminho/eeng, uminho/elach, 
+%                               %       uminho/ead, uminho/ese, uminho/eeng, uminho/elach, 
 %                               %       uminho/ed, uminho/ec, uminho/i3bs, uminho/emed, 
 %                               %       uminho/ie, uminho/ics, uminho/epsi, uminho/eeg
 %                               %       iscteiul/eta, ips/ests, ipl/isel, ipl/isel/meb,

diff --git a/Config/9_nova_fct.tex b/Config/9_nova_fct.tex
@@ -25,7 +25,12 @@
 %============================================================
 
 
-
+%%============================================================
+% The following is only relevant for the ADC Report of Computer Science students
+%%------------------------------------------------------------
+% \ntsetup{nova/fct/company/logo=google-logo}
+% \ntsetup{nova/fct/company/name=Google}
+%%============================================================
 
 
 %============================================================

diff --git a/Makefile b/Makefile
@@ -215,8 +215,9 @@ endif
 define mtp
 	make clean
 	echo "VERSION IS $(VERSION)"
-	test -n "$(shell git status --porcelain)" &&  git commit --all --message "Version $(VERSION)."
+	git commit --all --message "Version $(VERSION)." || true
 	git checkout main
+	git reset template.pdf
 	git pull
 	git merge -m "Merge branch 'develop'" develop
 	git tag -f -a "v$(VERSION)" -m "Version $(VERSION)."

diff --git a/NOVAthesisFiles/Schools/nova/fct/nova-fct-defaults.ldf b/NOVAthesisFiles/Schools/nova/fct/nova-fct-defaults.ldf
@@ -60,9 +60,9 @@
 \thesiscover(msc,spine,image):=?{nova-fct-spine-blue}
 
 % BSc cover
-\thesiscover(bsc,1-1,image):=?{nova-fct-cover-brown-front}
-\thesiscover(bsc,N-2,image):=?{nova-fct-cover-brown-back}
-\thesiscover(bsc,spine,image):=?{nova-fct-spine-brown}
+\thesiscover(bsc,1-1,image):=?{nova-fct-cover-red-front}
+\thesiscover(bsc,N-2,image):=?{nova-fct-cover-red-back}
+\thesiscover(bsc,spine,image):=?{nova-fct-spine-red}
 
 
 
@@ -133,20 +133,41 @@
 %% COVER 1
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ntaddtocover[vspace=-0.69mm,halign=l,hspace=-2.57cm,height=0.0cm,valign=t]{1-1}{%
-  \includegraphics[width=21mm,align=t]{\expanded{\theuniversity(logo,neg)}}%
-  \hspace{4.2mm}\vrule\hspace{5.0mm}%
-  \includegraphics[width=35.3mm,align=t]{\expanded{\theschool(logo,neg)}}%
-}
+% \ntaddtocover[vspace=-0.69mm,halign=l,hspace=-2.57cm,height=0.0cm,valign=t]{1-1}{%
+%   \includegraphics[width=21mm,align=t]{\expanded{\theuniversity(logo,neg)}}%
+%   \hspace{4.2mm}\vrule\hspace{5.0mm}%
+%   \includegraphics[width=35.3mm,align=t]{\expanded{\theschool(logo,neg)}}%
+% }
 
-% Department name
-\ntaddtocover[vspace=1.25mm,halign=l,hspace=6.1cm,height=2.0cm,valign=t]{1-1}{%
+% Department name 
+\ntaddtocover[vspace=2.5mm,halign=l,hspace=6.1cm,height=2.0cm,valign=t]{1-1,2-1}{%
   % \ntcoverbackground%
   \fontsize{14}{14}\selectfont%
-  \vspace*{-\baselineskip}
+  % \vspace*{-\baselineskip}
   \THEdepartment(\@LANG@COVER)%
 }
 
+\ntaddtocover[tikz]{1-1}{%
+  \node[anchor=center] at ($(current page.north west) + (20mm,-20mm)$)
+    {\includegraphics[width=21mm]{\expanded{\theuniversity(logo,neg)}}};%
+  \draw[thick] ($(current page.north west) + (3.5cm,-1cm)$) -- ++(0cm,-2cm);%
+  \node[anchor=west] at ($(current page.north west) + (40mm,-19mm)$)
+    {\includegraphics[width=35.3mm]{\expanded{\theschool(logo,neg)}}};%
+}
+
+% Company logo
+\ntaddtocover[tikz]{1-1,2-1}{%
+  \ifoptionvoid{/novathesis/nova/fct/company/logo}{}{%
+    \ifoptionequal{/novathesis/doctype}{bsc}{%
+      \ifoptionequal{/novathesis/schoolgiven}{nova/fct/di-adc}{%
+        \node[anchor=east] at ($(current page.north east) + (-1cm,-2cm)$)
+              {\includegraphics[width=40mm,height=21mm,keepaspectratio]
+                               {\option{/novathesis/nova/fct/company/logo}}};%
+      }{}%
+    }{}%
+  }%
+}
+
 % Title of Dissertation (PhD) / The author name (MSc)
 \ntaddtocover[vspace=5.3cm,halign=l,height=3.0cm,valign=c]{1-1}{%
   \ifphddoc{%
@@ -205,23 +226,47 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % LOGOS
-\ntaddtocover[vspace=1.0mm,hspace=-2.6cm,halign=l,height=2.0cm,valign=t]{2-1}{%
-  % \makebox[0pt]{\color{black!50}\rule{15cm}{5cm}}
-  \vspace*{-4mm}%
-  \begin{minipage}[b]{8.7cm}%
-  \includegraphics[width=2.15cm]{\expanded{\theuniversity(logo)}}%
-  \hspace{3.5mm}\rule{0.15mm}{2cm}\hspace{5mm}%
-  \raisebox{2.5mm}{\includegraphics[width=3.52cm]{\expanded{\theschool(logo)}}}%
-  \end{minipage}%
-  \raisebox{9mm}{%
-  \begin{minipage}[b]{9cm}%
-    \fontsize{14}{14}\selectfont%
-    \THEdepartment(\@LANG@COVER)%
-  \end{minipage}%
-  }\\[4ex]%
-  \hrule width 19cm%
+% \ntaddtocover[vspace=1.0mm,hspace=-2.6cm,halign=l,height=2.0cm,valign=t]{2-1}{%
+%   % \makebox[0pt]{\color{black!50}\rule{15cm}{5cm}}
+%   \vspace*{-4mm}%
+%   \begin{minipage}[b]{8.7cm}%
+%   \includegraphics[width=2.15cm]{\expanded{\theuniversity(logo)}}%
+%   \hspace{3.5mm}\rule{0.15mm}{2cm}\hspace{5mm}%
+%   \raisebox{2.5mm}{\includegraphics[width=3.52cm]{\expanded{\theschool(logo)}}}%
+%   \end{minipage}%
+%   \raisebox{9mm}{%
+%   \begin{minipage}[b]{9cm}%
+%     \fontsize{14}{14}\selectfont%
+%     \THEdepartment(\@LANG@COVER)%
+%   \end{minipage}%
+%   }\\[4ex]%
+%   \hrule width 19cm%
+% }
+
+
+\ntaddtocover[tikz]{2-1}{%
+  \node[anchor=center] at ($(current page.north west) + (20mm,-20mm)$)
+    {\includegraphics[width=21mm]{\expanded{\theuniversity(logo)}}};%
+  \draw[thick] ($(current page.north west) + (3.5cm,-1cm)$) -- ++(0cm,-2cm);%
+  \node[anchor=west] at ($(current page.north west) + (40mm,-19mm)$)
+    {\includegraphics[width=35.3mm]{\expanded{\theschool(logo)}}};%
+  \draw[thick] ($(current page.north west) + (1cm,-4.1cm)$) -- ++(\paperwidth-2cm,0cm);%
+}
+
+% Company logo
+\ntaddtocover[tikz]{1-1,2-1}{%
+  \ifoptionvoid{/novathesis/nova/fct/company/logo}{}{%
+    \ifoptionequal{/novathesis/doctype}{bsc}{%
+      \ifoptionequal{/novathesis/schoolgiven}{nova/fct/di-adc}{%
+        \node[anchor=east] at ($(current page.north east) + (-1cm,-2cm)$)
+              {\includegraphics[width=40mm,height=21mm,keepaspectratio]
+                               {\option{/novathesis/nova/fct/company/logo}}};%
+      }{}%
+    }{}%
+  }%
 }
 
+
 % Title of Dissertation (PhD)
 \ntaddtocover[vspace=3cm,halign=l]{2-1}{%
   \fontsize{17}{17}\selectfont%

diff --git a/NOVAthesisFiles/Schools/nova/fct/nova-fct-di-adc-defaults.ldf b/NOVAthesisFiles/Schools/nova/fct/nova-fct-di-adc-defaults.ldf
@@ -0,0 +1,53 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% nova/fct//nova-fct-red-defaults.ldf
+%% NOVA thesis document template
+%%
+%% This work is licensed under the
+%% The LaTeX project public license (LPPL), version 1.3c
+%% To view a copy of this license, visit
+%% https://www.latex-project.org/lppl/lppl-1-3c/
+%%
+%% Authors / Contributors:
+%%      - João Lourenço <[email protected]>
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\typeout{NT FILE schools/nova/fct/nova-fct-di-adc-defaults.ldf}%
+
+\input{NOVAthesisFiles/Schools/nova/fct/nova-fct-red-defaults.ldf}
+
+\printorder(frontmatter,final):={%
+  copyright;       % (*) The copyright page
+  abstracts;       % Print abstracts in multiple languages.
+  alllistof;       % Print all the listof defined in “6_list_of.tex”
+  printglossaries; % Print the Glossary, Acronyms, Symbols, etc…
+}
+
+\printorder(frontmatter,provisional):={\theprintorder(frontmatter,final)}
+
+\printorder(frontmatter,working):={%
+  abstracts;       % Print abstracts in multiple languages.
+  alllistof;       % Print all the listof defined in “6_list_of.tex”
+  printglossaries; % Print the Glossary, Acronyms, Symbols, etc…
+}
+
+\copyrighttextstring(pt)={A \theschool(\@LANG@COPYRIGHT)\ e a \theuniversity(\@LANG@COPYRIGHT)\ têm o direito perpétuo de arquivar este relatório em exemplares impressos reproduzidos em papel ou de forma digital, ou por qualquer outro meio conhecido ou que venha a ser inventado, comprometendo-se a manter o mesmo com acesso controlado e restrito, de forma a responder às suas obrigações legais.}
+
+
+\copyrighttextstring(en)={The \theschool(\@LANG@COPYRIGHT)\ and the \theuniversity(\@LANG@COPYRIGHT)\ have the perpetual right to archive this report in printed copies reproduced on paper or digitally, or by any other means known or invented, undertaking to keep it under controlled and restricted access in order to meet their legal obligations.}
+
+\ntsetup{spine/layout=no}
+
+\AtEndPreamble{
+\ntdepartment(pt){Departamento de\\Informática}
+\ntdepartment(en){Department of\\Computer Science}
+\ntdegreename(pt){Informática}
+\ntdegreename(en){Computer Science}
+\specialization(pt):={APDC — Relatório de Estágio em Empresa\ifoptionvoid{/novathesis/nova/fct/company/name}{}{ — \option{/novathesis/nova/fct/company/name}}}%
+\specialization(en):={APDC — Company Internship Report\ifoptionvoid{/novathesis/nova/fct/company/name}{}{ — \option{/novathesis/nova/fct/company/name}}}
+\ntauthordegree(pt){}
+\ntauthordegree(en){}
+\ntresetperson{committee}(c,m)
+\ntresetperson{committee}(c,f)
+\ntresetperson{committee}(r,m)
+\ntresetperson{committee}(r,f)
+}
diff --git a/NOVAthesisFiles/nt-version.sty b/NOVAthesisFiles/nt-version.sty
@@ -1,2 +1,2 @@
-\newcommand*{\novathesisversion}{7.2.1}
-\newcommand*{\novathesisdate}{2024-10-21}
+\newcommand*{\novathesisversion}{7.2.2}
+\newcommand*{\novathesisdate}{2024-10-25}
diff --git a/NOVAthesisFiles/options2.sty b/NOVAthesisFiles/options2.sty
@@ -595,7 +595,7 @@
 \newrobustcmd*{\option@listsize}[1]{%
   % \typeout{NT option@listsize [#1]}%
   \ifcsname c@#1/@sizecnt\endcsname%
-    \arabic{#1/@sizecnt}%
+    \arabic{c@#1/@sizecnt}%
   \else%
     0%
   \fi%

diff --git 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 2024-10-21 [7.2.2]
+%% Version 2024-10-25 [7.2.2]
 %% 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)
@@ -54,7 +54,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\ProvidesClass{novathesis}[2024-10-21 novathesis template]
+\ProvidesClass{novathesis}[2024-10-25 novathesis template]
 \NeedsTeXFormat{LaTeX2e}[2020-02-02]
 
 
@@ -213,7 +213,9 @@
   % abstract/theorder/.new list   = {unset},
   abstractorder/.new cmd        = {\appto\@nt@saveabstractorder{{#1},}},%
   % SCHOOL
-  school/.new cmd               = {\StrCut{#1}{/}\@UNIV\@SCHL\StrCut{\@SCHL}{/}\@SCHL\@DEGREEACR%
+  schoolgiven/.new value        = {},
+  school/.new cmd               = {\optionsalso{/novathesis/schoolgiven=#1}%
+                                   \StrCut{#1}{/}\@UNIV\@SCHL\StrCut{\@SCHL}{/}\@SCHL\@DEGREEACR%
                                    \@validate@ltx@processor{\@UNIV}{\@SCHL}{\@DEGREEACR}},
   school                        = nova/fct,
   % STYLES
@@ -257,8 +259,11 @@
   % DEBUG
   debug/.new list               = {},         % cover, index
 % SCHOOL specific customization
+% NOVA/FCT
+  nova/fct/company/logo/.new value              = {},
+  nova/fct/company/name/.new value              = {},
 % NOVA/IMS
-  nova/ims/sdg/.new list        = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17},
+  nova/ims/sdg/.new list                       = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17},
 % NOVA/ITQB
   nova/itqb/cover/color/.new choice            = {gray, green},
 % UMINHO
@@ -457,6 +462,13 @@
   \fullexpandarg
 }
 
+\def\ntresetperson#1(#2,#3){%
+  % #1 = class
+  \option@setnil{/@nt/#1/#2/name}%
+  \option@setnil{/@nt/#1/#2/full}%
+  \option@setnil{/@nt/#1/#2/gender}%
+}
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% MANAGE FILE LISTS
@@ -906,6 +918,7 @@
 %--------------------------------
 % TIKZ
 \RequirePackage{tikz}
+\usetikzlibrary{calc}
 
 %%%%% Fine tuning of typesetting
 \ifxeorlua{%
@@ -975,8 +988,8 @@
             {\@DOCCLASS,\@LANG@COVER},%
             {\@LANG@COVER}%
   )%
-  \ifblank{\match}{\specialization(#1):={#2}}{\specialization(#1):={\match\ #2}}%
-  \minorfield(#1):={#2}%
+  \ifblank{\match}{\specialization(#1)={#2}}{\specialization(#1)={\match\ #2}}%
+  \minorfield(#1)={#2}%
 }
 
 % --------------------------------------------------------
@@ -1972,7 +1985,7 @@
           {1}{\@ntprintpersonsasonecolumn{#1}{#2}{#5}{#6}}%
           {2}{\@ntprintpersonsastwocolumns{#1}{#5}{#6}}%
         }[\ClassError{novathesis}{Ivalid argument [#4] to \string\ntprintpersons{#1}{#2}{#4}{#5}{#6}}{}]%
-      \end{varwidth}
+      \end{varwidth}%
     \end{minipage}%
   }{}%
 }
@@ -2093,19 +2106,23 @@
 \newcommand{\@nt@printgrouptitle@text}[2]{%
   % #1 = {adviser | committee}
   % #2 = {a,c} | {c,r,a,m,g}
-\ifoptiondefined{/@nt/#1/#2/full}{%
+  \ifoptiondefined{/@nt/#1/#2/full}{%
+  \ifnum\value{\option{/@nt/#1/#2/full/@size}}>0\relax%
+  % \typeout{/@nt/#1/#2/full=\arabic{\option{/@nt/#1/#2/full/@size}}}\AAAAA
     \@nt@reducegender{/@nt/#1/#2/gender}{\@nt@advgender}%
     \@nt@reducenumber{/@nt/#1/#2/full}{\@nt@advnumber}%
     \bgroup%
       \datadefault{#1stringfont}(#2)%
       \datadefault{#1string}(#2,\@nt@advnumber,\@nt@advgender,\@LANG@COVER)%
     \egroup%
+  \fi%
   }{}%
 }
 
 \newcommand{\@nt@printgrouptitle}[2]{%
   % #1 = {adviser | committee}
   % #2 = {a,c} | {c,r,a,m,g}
+  \ifnum\value{\option{/@nt/#1/#2/full/@size}}>0\relax%
   \@nt@reducegender{/@nt/#1/#2/gender}{\@nt@advgender}%
   \@nt@reducenumber{/@nt/#1/#2/full}{\@nt@advnumber}%
   \datadefault{#1stringpre}(#2)%
@@ -2114,6 +2131,7 @@
     \datadefault{#1string}(#2,\@nt@advnumber,\@nt@advgender,\@LANG@COVER)%
   \egroup%
   \datadefault{#1stringpost}(#2)%
+  \fi%
 }
 
 \newcommand{\@nt@ntprintpersongroup}[4][full]{%
@@ -2122,6 +2140,7 @@
   % #3 = {adviser | committee}
   % #4 = {a,c} | {c,r,a,m,g}
   \ifoptiondefined{/@nt/#3/#4/full}{%
+  \ifnum\value{\option{/@nt/#3/#4/full/@size}}>0\relax%
     % \typeout{NTPRINTPERSONGROUP 1=[#1] 2=[#2] 3=[#3] 4=[#4]}\NTPRINTPERSONGROUP
     \@nt@printgrouptitle{#3}{#4}%
     \begin{varwidth}[t]{\linewidth-\maxlen}%
@@ -2133,6 +2152,7 @@
       }%
     \end{varwidth}%
     \thepersongrouppost()%
+  \fi%
   }{}%
 }
 

diff --git a/template.tex b/template.tex
@@ -8,7 +8,7 @@
 %% To view a copy of this license, visit
 %% https://www.latex-project.org/lppl/lppl-1-3c/
 %%
-%% Version 2024-10-21 [7.2.2]
+%% Version 2024-10-25 [7.2.2]
 %% 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)