Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
joaomlourenco committed May 5, 2024
2 parents 0042a62 + 2c41926 commit 74f38df
Show file tree
Hide file tree
Showing 6 changed files with 175 additions and 56 deletions.
19 changes: 19 additions & 0 deletions Config/9_ulisboa_ist.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Config/9_ulisboa_ist.ldf
%% NOVA thesis configuration file
%%
%% Customization for ULISBOA-IST
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%------------------------------------------------------------
% UNIVERSITY / SCHOOL SPECIFIC STUFF
% ULISBOA - IST
%------------------------------------------------------------

% The final classification
\ntsetup{classification=Aprovado com …} % Fill in with the appropriate grade

% Funding Institutions
% \ntsetup{funding={
% {Fundação para a Ciência e Tecnologia, projeto \#1234 1234 1234},%
% {União Europeia, projeto \#9876 ABCD}%
% }}
199 changes: 148 additions & 51 deletions NOVAthesisFiles/Schools/ulisboa/ist/ulisboa-ist-defaults.ldf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

\typeout{NT FILE ul/ist/defaults.ldf}%

\ifdocfinal{\ntsetup{print/secondcover=true}}{}

% Faculty / School
\school(pt):={Instituto Superior Técnico}
\school(en):={Instituto Superior Técnico}
Expand All @@ -32,23 +34,29 @@
\degreestring(msc,f,en):={MSc}
\degreestring(mscplan,m,en):={MSc}
\degreestring(mscplan,f,en):={MSc}
\degreestring(phd,m,en):={PhD}
\degreestring(phd,f,en):={PhD}
\degreestring(phdplan,m,en):={PhD}
\degreestring(phdplan,f,en):={PhD}
\degreestring(phdprop,m,en):={PhD}
\degreestring(phdprop,f,en):={PhD}
\degreestring(phd,m,en):={PhD Degree}
\degreestring(phd,f,en):={PhD Degree}
\degreestring(phdplan,m,en):={PhD Degree}
\degreestring(phdplan,f,en):={PhD Degree}
\degreestring(phdprop,m,en):={PhD Degree}
% \degreestring(phd,m,en):={PhD Degree}
% \degreestring(phd,f,en):={PhD Degree}
% \degreestring(phdplan,m,en):={PhD Degree}
% \degreestring(phdplan,f,en):={PhD Degree}
% \degreestring(phdprop,m,en):={PhD Degree}
% \degreestring(phdprop,f,en):={PhD Degree}

% Scientific field
% \majorfield(pt):={Engenharia Informática e de Computadores}
% \majorfield(en):={Computer Science and Engineering}

% Comiittee printing order
\committeeorder():={c,r,a,m}%
\committeeorder():={c,m}%

% Cover background images
\thesiscover(phd,1-1,bgcolor):={white}
% \thesiscover(phd,1-1,image):={modelo-capa-tese-provisoria}
% \thesiscover(phd,1-1,image):={modelo-capa-definitiva-tese-de-doutoramento-1}
% \thesiscover(phd,2-1,image):={modelo-capa-definitiva-tese-de-doutoramento-2}
% \thesiscover(phdplan,front,image):={}
% \thesiscover(phdprop,front,image):={}
% \thesiscover(msc,front,image):={}
Expand Down Expand Up @@ -79,33 +87,86 @@
\margin(cover,right):={2.75cm}


\ifdocfinal{% final
\dissertationstring(bsc,pt)={Tese aprovada em provas públicas para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(mscplan,pt)={Tese aprovada em provas públicas para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(msc,pt)={Tese aprovada em provas públicas para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdplan,pt)={Tese aprovada em provas públicas para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdprop,pt)={Tese aprovada em provas públicas para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phd,pt)={Tese aprovada em provas públicas para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}

\dissertationstring(bsc,en)={Thesis approved in public session to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(mscplan,en)={Thesis approved in public session to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(msc,en)={Thesis approved in public session to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdplan,en)={Thesis approved in public session to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdprop,en)={Thesis approved in public session to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phd,en)={Thesis approved in public session to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
}{% working, provisional
\dissertationstring(bsc,pt)={Relatório especialmente elaborado para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(mscplan,pt)={Relatório intermédio especialmente elaborado para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(msc,pt)={Dissertação especialmente elaborada para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdplan,pt)={Relatório intermédio especialmente elaborado para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdprop,pt)={Proposta de tese especialmente elaborada para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phd,pt)={Tese especialmente elaborada para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}

\dissertationstring(bsc,en)={Report specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(mscplan,en)={Dissertation plan specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(msc,en)={Dissertation specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdplan,en)={Thesis plan specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdprop,en)={Thesis proposal specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phd,en)={Thesis specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\%
{\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
}

\dissertationstring(bsc,pt)={Relatório especialmente elaborado para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(mscplan,pt)={Relatório intermédio especialmente elaborado para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(msc,pt)={Dissertação especialmente elaborada para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdplan,pt)={Relatório intermédio especialmente elaborado para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdprop,pt)={Proposta de tese especialmente elaborada para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phd,pt)={Tese especialmente elaborada para obtenção do Grau de %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ em\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\copyrighttextstring(pt)={O \theschool(\@LANG@COVER)\ e a \theuniversity(\@LANG@COVER)\ têm o direito, perpétuo e sem limites geográficos, de arquivar e publicar esta dissertação através de exemplares impressos reproduzidos em papel ou de forma digital, ou por qualquer outro meio conhecido ou que venha a ser inventado, e de a divulgar através de repositórios científicos e de admitir a sua cópia e distribuição com objetivos educacionais ou de investigação, não comerciais, desde que seja dado crédito ao autor e editor.}

\dissertationstring(bsc,en)={Report specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(mscplan,en)={Dissertation plan specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(msc,en)={Dissertation specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdplan,en)={Thesis plan specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phdprop,en)={Thesis proposal specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\dissertationstring(phd,en)={Thesis specifically prepared to obtain the %
\thedegreestring(\option{/novathesis/doctype},\expanded{\thedocauthor(gender)},\@LANG@COVER)\ in\\ {\fontsize{10.75}{12}\selectfont\themajorfield(\@LANG@COVER)}}
\copyrighttextstring(en)={The \theschool(\@LANG@COVER)\ and the \theuniversity(\@LANG@COVER)\ have the right, perpetual and without geographical boundaries, to file and publish this dissertation through printed copies reproduced on paper or on digital form, or by any other means known or that may be invented, and to disseminate through scientific repositories and admit its copying and distribution for non-commercial, educational or research purposes, as long as credit is given to the author and editor.}


Expand Down Expand Up @@ -144,7 +205,7 @@

% School
\ntaddtocover[vspace=5mm,hspace=23mm]{1-1,2-1}{%
\fontsize{15}{17}\selectfont%
\fontsize{15}{17}\selectfont%
% \SetTracking[ spacing = {25*,166, } ]{ encoding = * }{ 25 }%
\textbf{\textls[25]{\THEuniversity(\@LANG@COVER)}}\\%
\vspace{2mm}%
Expand All @@ -158,26 +219,32 @@

% % Title of Dissertation
\ntaddtocover[vspace=1.2cm,height=1.35cm,valign=c]{1-1,2-1}{%
\fontsize{11}{12}\selectfont%
\fontsize{11}{12}\selectfont%
\textbf{\thedoctitle(\@LANG@COVER,main,cover)}%
}

% Author name
\ntaddtocover[vspace=1.8cm,height=1.05cm]{1-1,2-1}{%
\fontsize{11}{12}\selectfont%
\ntaddtocover[vspace=1.0cm,height=1.05cm]{1-1,2-1}{%
\fontsize{11}{12}\selectfont%
\textbf{\thedocauthor(name)}%
}

% Advisers
\ntaddtocover[vspace=2.2cm,height=3.0cm,valign=t]{1-1,2-1}{%
\adviserstringfont():={\bfseries}%
\ntaddtocover[vspace=1.7cm,height=3.0cm,valign=t]{1-1}{%
\adviserstringfont():={\bfseries}%
\fontsize{11}{12}\selectfont%
\ntprintpersons[name]{0.9}{2}{adviser}{a,c}%
}

% Committee
\ntaddtocover[vspace=1.7cm,height=3.0cm,valign=t]{2-1}{%
\fontsize{11}{12}\selectfont%
\ntprintpersons[full]{0.9}{2}{committee}{\thecommitteeorder()}%
}

% Degree
\ntaddtocover[vspace=5.0mm,height=1.6cm,valign=t]{1-1,2-1}{%
\fontsize{10.75}{12}\selectfont%
\ntaddtocover[vspace=1,height=1.6cm,valign=t]{1-1}{%
\fontsize{10.75}{12}\selectfont%
\thepresentationtext%
}

Expand All @@ -195,20 +262,50 @@


% Images
\newdata{provisional}
\provisional(msc,pt):={Dissertação Provisória}
\provisional(phd,pt):={Tese Provisória}
\provisional(msc,en):={Draft}
\provisional(phd,en):={Draft}

\ntaddtocover[vspace=1.4cm,height=1.25cm,valign=t,status={working,provisional}]{1-1,2-1}{%
\fontsize{14}{14}\selectfont%
\theprovisional(\@DOCTYPE,\@LANG@COVER)%
\newdata{covermsg}
\covermsg(msc,pt,prov):={Dissertação Provisória}
\covermsg(phd,pt,prov):={Tese Provisória}
\covermsg(msc,en,prov):={Draft}
\covermsg(phd,en,prov):={Draft}
\ifoptionequal{/novathesis/ulisboa/ist/classification}{}{
\covermsg(msc,pt,final):={}
\covermsg(phd,pt,final):={}
\covermsg(msc,en,final):={}
\covermsg(phd,en,final):={}
}{
\covermsg(msc,pt,final):={Qualificação atribuída pelo Júri: \option{/novathesis/ulisboa/ist/classification}}
\covermsg(phd,pt,final):={Qualificação atribuída pelo Júri: \option{/novathesis/ulisboa/ist/classification}}
\covermsg(msc,en,final):={Jury final classification: \option{/novathesis/ulisboa/ist/classification}}
\covermsg(phd,en,final):={Jury final classification: \option{/novathesis/ulisboa/ist/classification}}
}

% Provisional/draf message
\ntaddtocover[vspace=1,height=1.25cm,valign=t,status={working,provisional}]{1-1}{%
\fontsize{12}{12}\selectfont%
\thecovermsg(\@DOCTYPE,\@LANG@COVER,prov)%
}

% Approved message
\ntaddtocover[vspace=1,height=1.25cm,valign=t,status={final}]{1-1}{%
\fontsize{11}{11}\selectfont%
\thecovermsg(\@DOCTYPE,\@LANG@COVER,final)%
}

% Funding
\ntaddtocover[vspace=1,height=1.25cm,valign=t,halign=l,status={final}]{2-1}{%
\ifoptionequal{/novathesis/ulisboa/ist/funding}{}{}{%
\newdata{funding}
\funding(pt):={Instituições Financiadoras:}
\funding(en):={Funding Institutions:}
\fontsize{11}{11}\selectfont%
\thefunding(\@LANG@COVER)\\[0.75ex]%
\@for\myi:=\expanded{\option{/novathesis/ulisboa/ist/funding}}\do{\hspace*{0.5cm}\myi]\\}
}%
}

% Date
\ntaddtocover[vspace=1,height=8.5mm,valign=t]{1-1,2-1}{%
\fontsize{14}{14}\selectfont%
\ntaddtocover[vspace=1,height=8.5mm,valign=b]{1-1,2-1}{%
\fontsize{12}{12}\selectfont%
{\thentdocdate(submission,month,text), \thentdocdate(submission,year)}%
}

2 changes: 1 addition & 1 deletion NOVAthesisFiles/nt-version.sty
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
\newcommand*{\novathesisversion}{7.1.26}
\newcommand*{\novathesisversion}{7.1.27}
\newcommand*{\novathesisdate}{2024-05-05}
2 changes: 1 addition & 1 deletion NOVAthesisFiles/options2.sty
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@
\newrobustcmd*{\option@listsize}[1]{%
% \typeout{NT option@listsize [#1]}%
\ifcsname c@#1/@sizecnt\endcsname%
\@nameuse{the#1/@sizecnt}%
\arabic{#1/@sizecnt}%
\else%
0%
\fi%
Expand Down
7 changes: 5 additions & 2 deletions novathesis.cls
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% To view a copy of this license, visit
%% https://www.latex-project.org/lppl/lppl-1-3c/
%%
%% Version 2024-05-05 [7.1.26]
%% Version 2024-05-05 [7.1.27]
%% 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)
Expand Down Expand Up @@ -260,7 +260,7 @@
% degreeacr/plain/.new value = {},
% SCHOOL specific customization
% NOVA/ITQB
nova/itqb/cover/color/.new choice = {gray, green},
nova/itqb/cover/color/.new choice = {gray, green},
% UMINHO
uminho/copyrightmodifier/.new choice = {by-nc-sa, by-sa, by, by-nc, by-nd, by-nc-nd},
uminho/skipblankcovers/.new toggle = false,
Expand All @@ -280,6 +280,9 @@
ulisboa/fmv/embargo/period/.new choice = {I, 6, 12},
ulisboa/fmv/embargo/justification/.new value = {Justification for the temporary embargo.},
ulisboa/fmv/reproduction/.new choice = {I, P, N},
% ULISBOA/IST
ulisboa/ist/classification/.new value = {},
ulisboa/ist/funding/.new value = {},
}

\newcommand{\@splitdate}[4]{%
Expand Down
2 changes: 1 addition & 1 deletion template.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% To view a copy of this license, visit
%% https://www.latex-project.org/lppl/lppl-1-3c/
%%
%% Version 2024-05-05 [7.1.26]
%% Version 2024-05-05 [7.1.27]
%% 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)
Expand Down

0 comments on commit 74f38df

Please sign in to comment.