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 Feb 28, 2022
2 parents 5adb6f2 + f74a3d9 commit e513337
Show file tree
Hide file tree
Showing 10 changed files with 153 additions and 123 deletions.
103 changes: 58 additions & 45 deletions Config/1_novathesis.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,16 @@
%%-------------------------------- ----------------------------
%% THE MOST IMPORTANT/POPULAR OPTIONS
%%------------------------------------------------------------

% \ntsetup{docdegree=msc} % The type of document
% % [ phd, phdplan, phdprop, msc, mscplan, bsc, plain ]
% % [ phd —> PhD thesis
% % phdplan —> PhD thesis plan
% % phdprop —> PhD thesis proposal
% % msc —> MSc dissertation
% % mscplan —> MSc dissertation plan
% % bsc —> BSc report
% % plain —> Other report
% % ]
% % DEFAULT: docdegree=phd

% \ntsetup{school=uminho/ee} % The school id
Expand All @@ -24,75 +32,80 @@
% % uminho/eeg, uminho/em, uminho/ep, uminho/ese,
% % uminho/ics, uminho/ie, uminho/ilch, uminho/i3b,
% % iscteiul/eta, ips/ests, ipl/isel, ulht/deisi
% % other/esep, other/mscgt ]
% % other/esep, other/mscgt
% % ]
% % DEFAULT: school=nova/fct

% \ntsetup{docstatus=final} % The status of the document
% % [ working —> working version of the document
% skips some “frontmatter” stuff,
% provisional —> submission version (no committee),
% final —> final version (with committee)
% (if you want the book spine,
% activete "spine=true" yourself) ]
% % DEFAULT: docstatus=working

% \ntsetup{langsused={en,pt,de}} % List of languages are used in the document
% % [ en, pt, fr, it, de, es ]
% \ntsetup{docstatus=final} % The status of the document
% % [ working —> working version of the document
% skips some “frontmatter” stuff,
% provisional —> submission version (no committee),
% final —> final version (with committee)
% (if you want the book spine,
% activete "spine=true" yourself)
% % ]
% % DEFAULT: docstatus=working

% \ntsetup{langsused={en,pt,fr,de}} % List of languages are used in the document
% % following ISO 3166-1 (alfa-2)
% % [ en, pt, fr, it, de, es —> valid languages
% % ]
% % DEFAULT: langsused=en,pt

% \ntsetup{lang=pt} % The main language for the document text
% % [ en, pt, fr, it, de, es ]
% % following ISO 3166-1 (alfa-2)
% % [ en, pt, fr, it, de, es —> valid languages
% % ]
% % DEFAULT: lang=en

% \ntsetup{linkscolor=SteelBlue}% The color for the hyperlinks (URLs,
% % cross references, citations)
% % for valid color names, look at "svgname"
% % in the "xcolor" package documentation
% % DEFAULT: whatever hyperref uses as default
% \ntsetup{linkscolor=SteelBlue}% The color for the hyperlinks (URLs, cross references, citations)
% % Valid color names —> look at "svgname" in the "xcolor"
% % package documentation
% % DEFAULT: a customized dark blue color

% \ntsetup{media=paper} % The target media for the PDF
% % [ screen, paper ]
% % SCREEN ==> left and right margins are
% % equal, colored links
% % PAPER ==> left and right margins are
% % different, black links
% % [ screen —> left and right margins are equal, colored links
% % paper —> left and right margins are, black links
% % ]
% % DEFAULT: media=screen

% \ntsetup{printfrontmatter=false}% Print the front matter
% % set to false to generate a PDF with only the
% % cover and the book chapters
% % DEFAULT: printfrontmatter=true

% \ntsetup{printcommittee=true}% Shall the evaluation committee be printed?
% % the evaluation committee should only be
% % printed in final versions.
% % DEFAULT: printcommittee=false

% \ntsetup{gnumberlist=false} % Shall the glossary entries list the page numbers where
% % those entries are used? (as a reverse index!)
% % DEFAULT: gnumberlist=true

% \ntsetup{spine=trim} % Print the “book spine” at the end of the document?
% % [ no —> do not print the book spine
% % full —> print the book spine in a full page
% % trim —> print and trim the page to the width
% % of the book spine
% % ]
% % DEFAULT: spine=trim <— if (docstatus=final)
% % spine=no <— otherwise


%%------------------------------------------------------------
%% THE LESS IMPORTANT/POPULAR OPTIONS
%%------------------------------------------------------------

% \ntsetup{secondcover=true} % Shall a second cover page be forced?
% % if the contents for the second page are not
% % defined, the second cover will be a replica
% % of the first cover.
% % DEFAULT: secondcover=false

% \ntsetup{spine=trim} % Print the “book spine” at the end of the document?
% % [ no, full, trim ]
% % NO ==> do not print the book spine
% % FULL ==> print the book spine in a full page
% % TRIM ==> print and trim the page to the width
% % of the book spine
% % DEFAULT: spine=no

% \ntsetup{urlstyle=same} % Use the same (main) font in URLs
% % DEFAULT: whatever hyperref uses as default

% \ntsetup{printcommittee=true}% Shall the evaluation committee be printed?
% % the evaluation committee should only be
% % printed in final versions.
% % DEFAULT: printcommittee=false

% \ntsetup{printfrontmatter=false}% Print the front matter
% % set to false to generate a PDF with only the
% % cover and the book chapters
% % DEFAULT: printfrontmatter=true

%%------------------------------------------------------------
%% THE LESS IMPORTANT/POPULAR OPTIONS
%%------------------------------------------------------------
% \ntsetup{numberallpages=true} % Shall all the pages (except cover) be numbered?
% % DEFAULT: numberallpages=false

Expand Down
46 changes: 23 additions & 23 deletions Config/3_cover.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,24 @@

%-------------------------------------------------------------------
% Thesis/Dissertation title (valid for all languages unless redefined as below)
% SYNTAX: \nttitle[lang]{title}
% You may use "\\" to force line breaks
% SYNTAX: \nttitle(type,lang){title}
% For [type] use: [main] for main title
% [sub] for sub-title
% [spine] for a book spine version of the title
% (if omittted defaults to main title without line breaks)
%-------------------------------------------------------------------
% You may use "\\" to force line breaks
\nttitle(main,en){A Very Long and Impressive\\Thesis Title with a Forced Line Break}%
\nttitle(main,pt){Um Título de Tese Longo\\e com uma Mudança de Linha Forçada}%

%-------------------------------------------------------------------
% Thesis/Dissertation subtitle (valid for all languages unless redefined as below)
% SYNTAX: \nttitle{title}
% You may use "\\" to force line breaks
%-------------------------------------------------------------------
\nttitle(sub,en){Some thoughts on the Life, the Universe,\\and Everything Else}%
\nttitle(sub,pt){Algumas considerações sobre a Vida,\\o Universo e Tudo o Mais}%

% You may NOT use "\\" to force line breaks
% \nttitle(spine,en){A Very Long and Impressive Thesis Title}%
% \nttitle(spine,pt){Um Título de Tese Longo e Impressionante}%

%-------------------------------------------------------------------
% DEPARTMENT NAME customization
% SYNTAX: \ntdepartment(language){name}
Expand All @@ -36,8 +40,8 @@
% the right name for your Department from the given list
% otherwiese fill the entries below
%-------------------------------------------------------------------
\ntdepartment*(pt){Departamento de\\\embrace{Nome do Departamento}}
\ntdepartment*(en){Department of\\\embrace{Name of the Department}}
\ntdepartment*(pt){Departamento de\\Nome do Departamento}
\ntdepartment*(en){Department of\\Name of the Department}

%-------------------------------------------------------------------
% DEGREE NAME customization
Expand All @@ -49,12 +53,8 @@
% the right name(s) for the PhD/MSc program from the given list
% otherwiese fill the entries below
%-------------------------------------------------------------------
\ntdegreename*(pt){\embrace{Nome do Programa de Estudos}}
\ntdegreename*(en){\embrace{Study Program Name}}
\ntdegreename*(de){\embrace{Name des Studienprogramms}}
\ntdegreename*(es){\embrace{Nombre del Programa de Estudios}}
\ntdegreename*(fr){\embrace{Nom du Programme d'Études}}
\ntdegreename*(it){\embrace{Nome del Programma di Studio}}
\ntdegreename*(pt){Nome do Programa de Estudos}
\ntdegreename*(en){Study Program Name}

%-------------------------------------------------------------------
% DEGREE SPECIALIZATION customization
Expand All @@ -64,21 +64,21 @@
% You may use "\\" to force line breaks
% The stared (*) version will only define if undefined, otherwise ignored
%-------------------------------------------------------------------
\ntspecialization*(pt){\embrace{Designação da Especialidade}}
\ntspecialization*(en){\embrace{Speciality Name}}
\ntspecialization*(pt){Designação da Especialidade}
\ntspecialization*(en){Speciality Name}

%-------------------------------------------------------------------
% SPONSORS customization
% Some Schools require the work sponsors to be listed in the cover
% SYNTAX: \ntsponsors(language){names}
%-------------------------------------------------------------------
\ntsponsors(pt){\embrace{Fontes de Financiamento}}
\ntsponsors(en){\embrace{Funding Sponsors}}
\ntsponsors(pt){Fontes de Financiamento}
\ntsponsors(en){Funding Sponsors}

%-------------------------------------------------------------------
% AUTHOR customization
% Author gender, full name, abd abbreviated name
% SYNTAX: \ntauthorname[gender]{full name}{abbreviated name}
% SYNTAX: \ntauthorname(gender){full name}{abbreviated name}
% Use [f] for female and [m] for male
%-------------------------------------------------------------------
\ntauthorname(m){John Very Longname Doe}{John Doe}
Expand All @@ -87,19 +87,19 @@
% AUTHOR previous degree
% SYNTAX: \ntauthordegree{degree}
%-------------------------------------------------------------------
\ntauthordegree(en){Master/BSc in \embrace{name of previous degree}}
\ntauthordegree(en){Master/BSc in Name of Previous Degree}

%-------------------------------------------------------------------
% SUBMISSION DATE
% SYNTAX: \ntdate{year,month}
% \ntdate{year}
%-------------------------------------------------------------------
\ntdate{\embrace{year},\embrace{month}}
\ntdate{year,month}

%-------------------------------------------------------------------
% ADVISERS LIST
% Advisers' gender and info (name, position, school)
% SYNTAX: \ntaddperson{adviser}[role,gender]{Name, Position, School}
% SYNTAX: \ntaddperson{adviser}(role,gender){Name, Position, School}
% For [role] use: [a] for adviser
% [c] for co-adviser
% For [gender] use: [f] for female
Expand All @@ -113,7 +113,7 @@

%-------------------------------------------------------------------
% COMMITTEE MEMBERS
% SYNTAX: \ntaddperson{committee}[role,gender]{Name, Position, School}
% SYNTAX: \ntaddperson{committee}(role,gender){Name, Position, School}
% For [role] use: [c] for committee chair
% [r] for rapporteurs
% [a] for advisers
Expand Down
12 changes: 6 additions & 6 deletions NOVAthesisFiles/ChapStyles/bar.ldf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
% \begin{adjustwidth}{}{-\chapindent}
\IfStrEq{#1}{}{% Unnumbered chapter
\hfill\begin{tabular}{r@{}}%|emacs
\leavevmode\chapnumfont #1\vphantom{1}%
\leavevmode\chapnumfont\normalfont #1\vphantom{1}%
\hspace*{3.6pt}%
\rule[-13.5pt]{0pt}{14.8mm}%
\\%
% \hline%
\end{tabular}%
}{%
\hfill\begin{tabular}{|r@{}}%|emacs
\leavevmode\chapnumfont ~#1\vphantom{1}%
\leavevmode\chapnumfont\normalfont ~#1\vphantom{1}%
\hspace*{3.6pt}%
\rule[-13.5pt]{0pt}{14.8mm}%
\\%
Expand All @@ -33,9 +33,9 @@
}%

\renewcommand*{\printchaptertitle}[1]{%
{\raggedleft\normalfont\scshape\chaptitlefont #1\par}\nobreak
{\raggedleft\chaptitlefont\normalfont\scshape #1\par}\nobreak
}

% \gappto{\secheadstyle}{\sffamily}
% \gappto{\subsecheadstyle}{\sffamily}
% \gappto{\subsubsecheadstyle}{\sffamily}
% \@for\i:={sec,subsec,subsubsec}\do{%
% \expandafter\gappto\csname \i headstyle\endcsname{\sffamily}%
% }
9 changes: 4 additions & 5 deletions NOVAthesisFiles/Schools/nova/fct/nova-fct-defaults.ldf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@
\spine(logo,msc,scale)={1.5}
\spine(logo,msc,raise)={0.075}

\spine(author)={\thedocauthor(name,short)}
\spine(title)={\thedoctitle(\option{/novathesis/coverlang},main,caps)}
\spine(date)={\thentdocdate(year)}

\spine(text,angle)={90}
\spine(box,textcolor)={white}
% \spine(box,color)={blue}
Expand Down Expand Up @@ -169,7 +165,9 @@
% Date
\ntaddtocover[vspace=1,align=l]{1-1}{%
\fontsize{14}{13}\selectfont%
\MakeTextUppercase{\thedegreename(\option{/novathesis/coverlang})}\\[3mm]%
\ifoptionequal{/novathesis/docdegree}{mscplan}{Dissertation Plan\\[1pt]}{}%
\MakeTextUppercase{\thedegreename(\option{/novathesis/coverlang})}%
\\[3mm]%
% {\ifdatadefined{specialization}(\option{/novathesis/coverlang}){%
% \fontsize{11}{11}\selectfont
% \\\MakeTextUppercase{\thespecialization(\option{/novathesis/coverlang})}}{}}
Expand Down Expand Up @@ -237,6 +235,7 @@
% Date
\ntaddtocover[vspace=1,align=l]{2-1}{%
\fontsize{10}{10}\selectfont%
\ifoptionequal{/novathesis/docdegree}{mscplan}{Dissertation Plan\\[1pt]}{}%
\MakeTextUppercase{\thedegreename(\option{/novathesis/coverlang})}
{\ifdatadefined{specialization}(\option{/novathesis/coverlang}){%
\fontsize{8}{9}\selectfont
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}{6.9.5}
\newcommand*{\novathesisdate}{2022-02-02}
\newcommand*{\novathesisversion}{6.9.6}
\newcommand*{\novathesisdate}{2022-02-28}
3 changes: 2 additions & 1 deletion NOVAthesisFiles/packages.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@
\RequirePackage{NOVAthesisFiles/glossary-xltabular}%
\setglossarystyle{xltabular}%
\setabbreviationstyle[acronym]{long-short}%

\GlsXtrEnablePreLocationTag{\emph{(\small p.~}}{\emph{(\small pp.~}}
\renewcommand{\GlsXtrFormatLocationList}[1]{\emph{\small#1)}}
\renewcommand{\glsnamefont}[1]{\textbf{#1}}%

%--------------------------------
Expand Down
2 changes: 1 addition & 1 deletion NOVAthesisFiles/spine.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
\def\def@ult#1(#2)=#3{\ifdatadefined{#1}(#2){}{\csname#1\endcsname(#2)={#3}}}

\def@ult{spine}(author)={\thedocauthor(name,short)}
\def@ult{spine}(title)={\thedoctitle(\option{/novathesis/coverlang},main,caps)}
\def@ult{spine}(title)={\thedoctitle(\option{/novathesis/coverlang},spine)}
\def@ult{spine}(date)={\thentdocdate(year)}

\def@ult{spine}(text,angle)={90}
Expand Down
Loading

0 comments on commit e513337

Please sign in to comment.