Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@joaomlourenco
joaomlourenco committed Nov 3, 2024
2 parents 64817bd + 275e373 commit ef27ba1
Show file tree
Hide file tree
Showing 7 changed files with 196 additions and 137 deletions.
Binary file added NOVAthesisFiles/Images/qrcode-donate.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 46 additions & 23 deletions NOVAthesisFiles/Schools/nova/fct/nova-fct-defaults.ldf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@

\typeout{NT FILE schools/nova/fct/nova-fct-defaults.ldf}%

\definecolor{fctlightgreen}{RGB}{67,140,74}%
\definecolor{fctdarkgreen}{RGB}{67,140,74}%
\definecolor{fctlightblue}{RGB}{67,120,188}%
\definecolor{fctdarkblue}{RGB}{46,108,195}%
\definecolor{fctlightred}{RGB}{95,5,44}%
\definecolor{fctdarkred}{RGB}{117,37,60}%
\definecolor{fctlightbrown}{RGB}{129,87,36}%
\definecolor{fctdarkbrown}{RGB}{142,112,51}%

\def\@fctblackheight{4.088cm}

% FCT-NOVA specific customization
\openany
\ntsetup{print/secondcover=true}
Expand All @@ -39,15 +50,15 @@
\committeeorder():={c,r,a,ca,m}%

% Cover background images
\thesiscover(1-1,bgcolor):={black}
% \thesiscover(1-1,bgcolor):={black}
\thesiscover(1-1,textcolor):={white}
\thesiscover(2-1,textcolor):={black}
% \thesiscover(2-1,textcolor):={black}


% DEFAULT cover
\thesiscover(1-1,image):=?{nova-fct-cover-red-front}
\thesiscover(N-2,image):=?{nova-fct-cover-red-back}
\thesiscover(spine,image):=?{nova-fct-spine-red}
% \thesiscover(spine,image):=?{nova-fct-spine-red}

% PhD cover
\thesiscover(phd,1-1,image):=?{nova-fct-cover-green-front}
Expand Down Expand Up @@ -102,10 +113,11 @@
\margin(paper,right):={3.0cm}

% Set margins for cover pages
\margin(cover,top):={1.0cm}
\margin(cover,top):={8.6cm}
\margin(cover,bottom):={1.5cm}
\margin(cover,left):={3.55cm}
\margin(cover,right):={2.0cm}
\margin(cover,2-1,top):={6.6cm}


\newdata{dissertationplan}
Expand Down Expand Up @@ -133,20 +145,8 @@
%% 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)}}%
% }

% 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}
\THEdepartment(\@LANG@COVER)%
}

% -------------------------------------------------------------------------------
% University and school logo
\ntaddtocover[tikz]{1-1}{%
\node[anchor=center] at ($(current page.north west) + (20mm,-20mm)$)
{\includegraphics[width=21mm]{\expanded{\theuniversity(logo,neg)}}};%
Expand All @@ -155,7 +155,25 @@
{\includegraphics[width=35.3mm]{\expanded{\theschool(logo,neg)}}};%
}

% Company logo
% \ntAddToCoverTikz[anchor=center]($(current page.north west) + (20mm,20mm)$){1-1}{%
% \includegraphics[width=21mm]{\expanded{\theuniversity(logo,neg)}}
% }
% \ntAddToCoverTikz[anchor=west]($(current page.north west) + (40mm,19mm)$){1-1}{%
% \includegraphics[width=35.3mm]{\expanded{\theschool(logo,neg)}}
% }
% \ntAddToCoverTikz<\draw>[thick]($(current page.north west) + (3.5cm,1cm)$)[-- ++(0cm,2cm)]{1-1}{%
% }


% -------------------------------------------------------------------------------
% Department
\ntAddToCoverTikz[anchor=north west]($(current page.north west) + (96.45mm,11.4mm)$){1-1,2-1}{%
\fontsize{14}{14}\sffamily%
\makecell[tl]{\THEdepartment(\@LANG@COVER)}%
}

% -------------------------------------------------------------------------------
% Company logo — only for fct/di-adc bsc documents
\ntaddtocover[tikz]{1-1,2-1}{%
\ifoptionvoid{/novathesis/nova/fct/company/logo}{}{%
\ifoptionequal{/novathesis/doctype}{bsc}{%
Expand All @@ -168,8 +186,9 @@
}%
}

% -------------------------------------------------------------------------------
% Title of Dissertation (PhD) / The author name (MSc)
\ntaddtocover[vspace=5.3cm,halign=l,height=3.0cm,valign=c]{1-1}{%
\ntaddtocover[halign=l,height=3.0cm,valign=c]{1-1}{%
\ifphddoc{%
\fontsize{22}{21}\selectfont%
\textbf{\THEdoctitle(\@LANG@COVER,main,cover)}%
Expand All @@ -186,6 +205,7 @@
}%
}

% -------------------------------------------------------------------------------
% The author name (PhD) / Title of Dissertation (MSc)
\ntaddtocover[vspace=3.0cm,halign=l,height=3cm,valign=c]{1-1}{%
\ifphddoc{%
Expand All @@ -204,7 +224,8 @@
}%
}

% Date
% -------------------------------------------------------------------------------
% Degrere name, Specialization, Date
\ntaddtocover[vspace=1,halign=l]{1-1}{%
\fontsize{14}{13}\selectfont%
\ifmaindoc{}{\thedissertationplan(\@DOCTYPE,\@LANG@COVER)\\[1pt]}%
Expand All @@ -221,6 +242,8 @@
}{\thentdocdate(submission,month,text), \thentdocdate(submission,year)}%
}



%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% COVER 2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Expand Down Expand Up @@ -268,7 +291,7 @@


% Title of Dissertation (PhD)
\ntaddtocover[vspace=3cm,halign=l]{2-1}{%
\ntaddtocover[halign=l]{2-1}{%
\fontsize{17}{17}\selectfont%
\textbf{\THEdoctitle(\@LANG@COVER,main,cover)}%
\ifdatadefined{doctitle}(\@LANG@COVER,sub,cover){%
Expand Down Expand Up @@ -306,7 +329,7 @@
\fontsize{10}{10}\selectfont%
\ifmaindoc{}{\thedissertationplan(\@DOCTYPE,\@LANG@COVER)\\[1pt]}%
% \ifoptionequal{/novathesis/doctype}{mscplan}{Dissertation Plan\\[1pt]}{}%
\THEdegreename(\@LANG@COVER)
\THEdegreename(\@LANG@COVER)%
{\ifdatadefined{specialization}(\@LANG@COVER){%
\fontsize{8}{9}\selectfont
\\\THEspecialization(\@LANG@COVER)}{}}%
Expand Down
36 changes: 18 additions & 18 deletions NOVAthesisFiles/Schools/nova/itqb/nova-itqb-defaults.ldf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,24 +199,24 @@


\ntaddtocover[tikz]{1-1}{%
\datamatch{\@MRGN@top}{margin}({cover,\option{/novathesis/doctype},1-1,top},%
{cover,\option{/@nt/document/docclass},1-1,top},%
{cover,1-1,top},
{cover,\option{/novathesis/doctype},top},%
{cover,\option{/@nt/document/docclass},top},%
{cover,top})%
\datamatch{\@MRGN@left}{margin}({cover,\option{/novathesis/doctype},1-1,left},%
{cover,\option{/@nt/document/docclass},1-1,left},%
{cover,1-1,left},
{cover,\option{/novathesis/doctype},left},%
{cover,\option{/@nt/document/docclass},left},%
{cover,left})%
\datamatch{\@MRGN@right}{margin}({cover,\option{/novathesis/doctype},1-1,right},%
{cover,\option{/@nt/document/docclass},1-1,right},%
{cover,1-1,right},
{cover,\option{/novathesis/doctype},right},%
{cover,\option{/@nt/document/docclass},right},%
{cover,right})%
% \datamatch{\@MRGN@top}{margin}({cover,\option{/novathesis/doctype},1-1,top},%
% {cover,\option{/@nt/document/docclass},1-1,top},%
% {cover,1-1,top},
% {cover,\option{/novathesis/doctype},top},%
% {cover,\option{/@nt/document/docclass},top},%
% {cover,top})%
% \datamatch{\@MRGN@left}{margin}({cover,\option{/novathesis/doctype},1-1,left},%
% {cover,\option{/@nt/document/docclass},1-1,left},%
% {cover,1-1,left},
% {cover,\option{/novathesis/doctype},left},%
% {cover,\option{/@nt/document/docclass},left},%
% {cover,left})%
% \datamatch{\@MRGN@right}{margin}({cover,\option{/novathesis/doctype},1-1,right},%
% {cover,\option{/@nt/document/docclass},1-1,right},%
% {cover,1-1,right},
% {cover,\option{/novathesis/doctype},right},%
% {cover,\option{/@nt/document/docclass},right},%
% {cover,right})%
% Text in rectangle
\setbox0=\hbox{\scalebox{2.15}{\bfseries\thentdocdate(submission,year)}}
\begin{scope}[shift=(current page.north west), xshift=\@MRGN@left]
Expand Down
4 changes: 2 additions & 2 deletions NOVAthesisFiles/nt-version.sty
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
\newcommand*{\novathesisversion}{7.2.4}
\newcommand*{\novathesisdate}{2024-11-01}
\newcommand*{\novathesisversion}{7.2.5}
\newcommand*{\novathesisdate}{2024-11-03}
5 changes: 3 additions & 2 deletions NOVAthesisFiles/spine.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
\spine(margin,bottom):=?{1mm}
\spine(margin,left):=?{0.5cm}
\spine(margin,right):=?{0.5cm}
\spine(tikzbg):=?{}

% Defaults for spine boxes
\spine(box,margin):=?{0.5mm}
Expand Down Expand Up @@ -160,7 +161,7 @@
}

\newcommand{\ifnotnone}[2]{%
\IfStrEq{none}{#1}{}{#2}%
\IfStrEq{#1}{none}{}{#2}%
}


Expand Down Expand Up @@ -333,7 +334,7 @@
{\@DOCTYPE,bg,color},%
{\@DOCCLASS,bg,color},%
{bg,color}%
){\ifnotnone{\arg}{\fill [color=\arg] (0,0) rectangle (\paperwidth,\paperheight);}}{%
){\ifnotnone{\arg}{\pagecolor{\arg}}}{%
\ClassError{novathesis}{Undefined spine “bg,color”}{}%
}%
% print frame IF DEFINED
Expand Down
Loading

0 comments on commit ef27ba1

Please sign in to comment.