diff --git a/LaTeX/defaults.tex b/LaTeX/defaults.tex index 80f995d3..5ddcfdb7 100644 --- a/LaTeX/defaults.tex +++ b/LaTeX/defaults.tex @@ -1,11 +1,14 @@ % Univesity -\university{Universidade Nova de Lisboa} +\university[pt]={Universidade NOVA de Lisboa} +\university[en]={NOVA University of Lisbon} % Faculty / School -\faculty{Faculdade de Ciências e Tecnologia} +\faculty[pt]={Faculdade de Ciências e Tecnologia} +\faculty[en]={Faculty of Sciences and Technology} % Área científica -\majorfield{Engenharia Informática} +\majorfield[pt]={Engenharia Informática} +\majorfield[en]={Computer Science and Engineering} % Imagens de fundo na capa das teses \thesiscoverphd{cover-phd-std} diff --git a/LaTeX/langsupport.tex b/LaTeX/langsupport.tex index 840ade5c..4d17baaa 100644 --- a/LaTeX/langsupport.tex +++ b/LaTeX/langsupport.tex @@ -44,33 +44,33 @@ \UNL@degreestr[prepmsc,f,pt]={Mestre} \UNL@degreestr[phd,m,pt]={Doutor} \UNL@degreestr[phd,f,pt]={Doutor} -\UNL@degreestr[prepphd,m,pt]={Doutor} -\UNL@degreestr[prepphd,f,pt]={Doutor} +\UNL@degreestr[phdplan,m,pt]={Doutor} +\UNL@degreestr[phdplan,f,pt]={Doutor} \UNL@degreestr[propphd,m,pt]={Doutor} \UNL@degreestr[propphd,f,pt]={Doutor} \UNL@doctypestr[bsc,pt]={Projeto de Licenciatura} \UNL@doctypestr[msc,pt]={Dissertação de Mestrado} \UNL@doctypestr[prepmsc,pt]={Preparação de Dissertação} -\UNL@doctypestr[prepphd,pt]={Preparação de Tese} +\UNL@doctypestr[phdplan,pt]={Plano de Tese} \UNL@doctypestr[phd,pt]={Proposta de Tese de Doutoramento} \UNL@doctypestr[propphd,pt]={Tese de Doutoramento} -\UNL@jurytitlestr[pt]={Júri} -\UNL@presidentstr[1,pt]={Presidente} -\UNL@presidentstr[2,pt]={Presidentes} -\UNL@refereestr[1,pt]={Arguente} -\UNL@refereestr[2,pt]={Arguentes} +\UNL@committeetitlestr[pt]={Júri} +\UNL@chairstr[1,pt]={Presidente} +\UNL@chairstr[2,pt]={Presidentes} +\UNL@raporteurstr[1,pt]={Arguente} +\UNL@raporteurstr[2,pt]={Arguentes} \UNL@memberstr[1,pt]={Vogal} \UNL@memberstr[2,pt]={Vogais} -\UNL@dissertationstr[bsc,pt]={Relatório para obtenção do Grau de \\\UNL@degree\ em \@majorfield} -\UNL@dissertationstr[prepmsc,pt]={Relatório intermédio para obtenção do Grau de \\\UNL@degree\ em \@majorfield} -\UNL@dissertationstr[msc,pt]={Dissertação para obtenção do Grau de \\\UNL@degree\ em \@majorfield} -\UNL@dissertationstr[propphd,pt]={Proposta de tese para obtenção do Grau de \\\UNL@degree\ em \@majorfield} -\UNL@dissertationstr[prepphd,pt]={Relatório intermédio para obtenção do Grau de \\\UNL@degree\ em \@majorfield} -\UNL@dissertationstr[phd,pt]={Dissertação para obtenção do Grau de \\\UNL@degree\ em \@majorfield} -\UNL@copyrighttext[pt]={A \@faculty\ e a \@university\ 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 objectivos educacionais ou de investigação, não comerciais, desde que seja dado crédito ao autor e editor.} +\UNL@dissertationstr[bsc,pt]={Relatório para obtenção do Grau de \\\UNL@degree\ em \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[prepmsc,pt]={Relatório intermédio para obtenção do Grau de \\\UNL@degree\ em \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[msc,pt]={Dissertação para obtenção do Grau de \\\UNL@degree\ em \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[propphd,pt]={Proposta de tese para obtenção do Grau de \\\UNL@degree\ em \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[phdplan,pt]={Relatório intermédio para obtenção do Grau de \\\UNL@degree\ em \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[phd,pt]={Dissertação para obtenção do Grau de \\\UNL@degree\ em \majorfield[\UNL@cover@lang]} +\UNL@copyrighttext[pt]={A \faculty[\UNL@cover@lang]\ e a \university[\UNL@cover@lang]\ 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.} @@ -93,32 +93,32 @@ \UNL@degreestr[msc,f,en]={Master} \UNL@degreestr[prepmsc,m,en]={Master} \UNL@degreestr[prepmsc,f,en]={Master} -\UNL@degreestr[phd,m,en]={Doctorate} -\UNL@degreestr[phd,f,en]={Doctorate} -\UNL@degreestr[prepphd,m,en]={Doctorate} -\UNL@degreestr[prepphd,f,en]={Doctorate} -\UNL@degreestr[propphd,m,en]={Doctorate} -\UNL@degreestr[propphd,f,en]={Doctorate} +\UNL@degreestr[phd,m,en]={Doctor} +\UNL@degreestr[phd,f,en]={Doctor} +\UNL@degreestr[phdplan,m,en]={Doctor} +\UNL@degreestr[phdplan,f,en]={Doctor} +\UNL@degreestr[propphd,m,en]={Doctor} +\UNL@degreestr[propphd,f,en]={Doctor} \UNL@doctypestr[bsc,en]={Bachelor Report} \UNL@doctypestr[msc,en]={Master of Science Dissertation} \UNL@doctypestr[prepmsc,en]={Master of Science Qualification} -\UNL@doctypestr[prepphd,en]={Doctorate Qualification} +\UNL@doctypestr[phdplan,en]={Doctorate Qualification} \UNL@doctypestr[propphd,en]={Doctorate Proposal} \UNL@doctypestr[phd,en]={Doctorate Dissertation} -\UNL@jurytitlestr[pen]={Committee} -\UNL@presidentstr[1,en]={President} -\UNL@presidentstr[2,en]={Presidents} -\UNL@refereestr[1,en]={Referee} -\UNL@refereestr[2,en]={Referees} -\UNL@memberstr[1,en]={Other} -\UNL@memberstr[2,en]={Others} +\UNL@committeetitlestr[en]={Committee} +\UNL@chairstr[1,en]={Chair} +\UNL@chairstr[2,en]={Chair} +\UNL@raporteurstr[1,en]={Raporteur} +\UNL@raporteurstr[2,en]={Raporteurs} +\UNL@memberstr[1,en]={Member} +\UNL@memberstr[2,en]={Members} -\UNL@dissertationstr[bsc,en]={TBD: Relatório para obtenção do Grau de \\\UNL@degree em \@majorfield} -\UNL@dissertationstr[prepmsc,en]={TBD: Relatório intermédio para obtenção do Grau de \\\UNL@degree em \@majorfield} -\UNL@dissertationstr[msc,en]={TBD: Dissertação para obtenção do Grau de \\\UNL@degree em \@majorfield} -\UNL@dissertationstr[propphd,en]={TBD: Proposta de tese para obtenção do Grau de \\\UNL@degree em \@majorfield} -\UNL@dissertationstr[prepphd,en]={TBD: Relatório intermédio para obtenção do Grau de \\\UNL@degree em \@majorfield} -\UNL@dissertationstr[phd,en]={TBD: Dissertação para obtenção do Grau de \\\UNL@degree em \@majorfield} -\UNL@copyrighttext[en]={TBD: A \@faculty\ e a \@university\ 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 objectivos educacionais ou de investigação, não comerciais, desde que seja dado crédito ao autor e editor.} +\UNL@dissertationstr[bsc,en]={TBD: Report submitted in partial fulfillment \\of the requirements for the degree of \\\UNL@degree\ in \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[prepmsc,en]={TBD: Report submitted in partial fulfillment \\of the requirements for the degree of \\\UNL@degree\ in \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[msc,en]={TBD: Dissertation submitted in partial fulfillment \\of the requirements for the degree of \\\UNL@degree\ in \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[propphd,en]={TBD: Report submitted in partial fulfillment \\of the requirements for the degree of \\\UNL@degree\ in \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[phdplan,en]={TBD: Report submitted in partial fulfillment \\of the requirements for the degree of \\\UNL@degree\ in \majorfield[\UNL@cover@lang]} +\UNL@dissertationstr[phd,en]={Dissertation submitted in partial fulfillment \\of the requirements for the degree of \\\UNL@degree\ in \majorfield[\UNL@cover@lang]} +\UNL@copyrighttext[en]={\textbf{TO BE REVISED}: The \faculty[\UNL@cover@lang]\ and the \university[\UNL@cover@lang]\ have the perpetual and geographically unlimited right of archiving and publishing this dissertation both in printed and digital forms, or by any other known or unknown means, and of publishing it in scientific repositories and of allowing its duplication and non-commercial distribution with educational or research purposes, as long as credit is given to the author and editor.} diff --git a/LaTeX/template.pdf b/LaTeX/template.pdf index 65ef72a9..51ed64a5 100644 Binary files a/LaTeX/template.pdf and b/LaTeX/template.pdf differ diff --git a/LaTeX/template.tex b/LaTeX/template.tex index e4b4447d..4f5d545e 100644 --- a/LaTeX/template.tex +++ b/LaTeX/template.tex @@ -2,7 +2,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Template for writing dissertations with ThesisDIFCTUNL %% -%% Version 20150225 (Fev 2015) +%% Version 01072015 (Jul 2015) %% Departamento de Informática %% Faculdade de Ciências e Tecnologia %% Universidade Nova de Lisboa @@ -23,8 +23,8 @@ %% bsc - BSc graduation report %% prepmsc - Preparation of MSc dissertation %% (*)msc - MSc dissertation -%% propphd - Proposal of PhD thesis -%% prepphd - Preparation of PhD thesis +%% phdplan - PhD thesis plan +%% propphd - PhD thesis proposal %% phd - PhD thesis %% - Values for option 'lang' %% pt - português @@ -64,11 +64,12 @@ %%%%%%%% and replace "draft" for "final" in "memoir={a4paper,11pt, draft}". %%%%%%%% \documentclass[ - doctype=msc, % The type of document + doctype=phd, % The type of document lang=en, % The main langage of the document + coverlang=pt, enc=utf8, % You shouldn't mess with this one linkscolor=darkblue, % Switch to black for PRINTING - spine=true, % Should be set to false until the final printing + spine=false, % Should be set to false until the final printing biblatex={ style=numeric, % ALTERNATIVES: numeric, alphabetic, authoryear, bwl-FU sorting=nyt, % ALTERNATIVES: none, nyt, ynt @@ -92,45 +93,25 @@ % Additional packages you may ant to use (comment those not needed) %------------------------------------------------------------------ -% FOR DEMO ONLY --- TO BE REMOVED by final users -\usepackage{lipsum} - - -% To enable customizble enumerates -\usepackage{paralist} - -% Beautiful simple tables -\usepackage{booktabs} - -% Use colors in background of table cells -%\usepackage{colortbl} - -% Fontification of source code listings -\usepackage{listings} - -% To create gloassries -\usepackage[nonumberlist,translate=babel]{glossaries} +%% VERY IMPORTANT +\usepackage{booktabs} % Beautiful simple tables +\usepackage{paralist} % To enable customizble enumerates +\usepackage[nonumberlist,translate=babel]{glossaries} % To create gloassries \glsdisablehyper \makenoidxglossaries +\InputIfFileExists{Chapters/acronyms}{}{} % The contents of both files (acronyms and glossary) will be merged +\InputIfFileExists{Chapters/glossary}{}{} % The contents of both files (acronyms and glossary) will be merged -% The contents of both files (acronyms and glossary) will be merged -\InputIfFileExists{Chapters/acronyms}{% - % File glossary.tex exists and is read -}{% - % File glossary.tex is not found, ignore -} -\InputIfFileExists{Chapters/glossary}{% - % File glossary.tex exists and is read -}{% - % File glossary.tex is not found, ignore -} - -% To register TODO notes in the text -\usepackage[textsize=footnotesize]{todonotes} +%% IMPORTANT (consider removing/commenting) +\usepackage{listings} % Fontification of source code listings +%\usepackage{colortbl} % Use colors in background of table cells +\usepackage[textsize=footnotesize]{todonotes} % To register TODO notes in the text \setlength{\marginparwidth}{1.5cm} -% To handle subfigures -\newsubfloat{figure} + + +%% FOR DEMO PURPOSES ONLY --- TO BE REMOVED by final users +\usepackage{lipsum} %------------------------------------------------------------------ @@ -157,61 +138,67 @@ %------------------------------------------------------------------ % Some default values that you may whish to override %------------------------------------------------------------------ -%% Identification: items prefixed with (*) are the default values, -% as defined in the file "defaults.tex" -% (*)\university{Universidade Nova de Lisboa} -% (*)\faculty{Faculdade de Ciências e Tecnologia} -% (*)\majorfield{Engenharia Informática} -% (*)\universitylogo{logounl} -% (*)\thesiscoverphd{cover-phd} -% (*)\thesiscovermsc{cover-msc-round} -> there is an alternative with squre corners -% (*)\thesiscoverplain{cover-plain} +% Identification: defined in the file "defaults.tex" +% +% Univesity +% \university[pt]={Universidade NOVA de Lisboa} +% \university[en]={NOVA University of Lisbon} +% +% % Faculty / School +% \faculty[pt]={Faculdade de Ciências e Tecnologia} +% \faculty[en]={Faculty of Sciences and Technology} +% +% % Área científica +% \majorfield[pt]={Engenharia Informática} +% \majorfield[en]={Computer Science and Engineering} +% +% % Imagens de fundo na capa das teses +% \thesiscoverphd{cover-phd-std} +% \thesiscovermsc{cover-msc-std} +% \thesiscoverbsc{cover-bsc-std} +% \thesiscoverplain{cover-plain-std} %%============================================================ % Title of the dissertation/thesis % USe "\\" to break the title into two or more lines -\title{[Título da tese / Thesis Title]} +\title{Impressive Thesis Title} % Autor % use [f] for female and [m] for male -\author[m]{[Nome completo do autor]} -\shortauthor{[Nome abreviado do autor]} -\authordegree{[Habilitações académcias]} +\author[m]{John Longname Doe} +\shortauthor{John Doe} +\authordegree{Master of Science} % Date -\themonth{MÊS} -\theyear{ANO} +\themonth{June} +\theyear{2015} % Advisers (maximum of 9) % use [f] for female and [m] for male -\adviser[m]{[Nome do orientador]}{[Cargo]}{[Instituição]} -\adviser[m]{[Nome do orientador 2]}{[Prof.\ Catedrático]}{[Universidade Nova de Lisboa]} -% A trick to force the University to go to the next line :) -% \adviser[m]{João M. S. Lourenço}{Prof.\ Auxiliar}{\\&Universidade Nova de Lisboa} +\adviser[f]{John Doe Adviser Name}{Full Professor}{\newline NOVA University of Lisbon} +\adviser[m]{John Doe Male Adviser Name}{Associate Professor}{Some University Somewhere} % Co-Advisers (maximum of 9) % use [f] for female and [m] for male -\coadviser[f]{[Nome da co-orientadora 1]}{[Cargo]}{[Instituição]} +\coadviser[f]{John Doe Co-Adviser Name}{Associate Professor}{Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa} % \coadviser[f]{[Nome da co-orientadora 2]}{[Profª.\ Auxiliar]}{[Universidade Nova de Lisboa]} -% Jury (maximum of 9 elements) -% Use [p] for president, [a] for referees, [v] or nothing for others -% President of the jury -\jury[p]{[Nome do presidente do júri]} -% Main referees -\jury[a]{[Nome do primeiro arguente]} -% \jury[a]{[Nome do segundo arguente]} -% Other members of the jury - include the Adviser in this list -\jury[v]{[Nome do primeiro vogal]} -\jury[v]{[Nome do segundo vogal]} -% \jury[v]{[Nome do terceiro vogal]} -% \jury[v]{[Nome do quarto vogal]} -% \jury{[Nome do quinto vogal]} -% \jury{[Nome do sexto vogal]} +% committee (maximum of 9 elements) +% Use [p] for chair, [a] for raporteurs, [v] or nothing for remaining members +% President of the committee +\committee[p]{Name of the committee chair} +% Main raporteurs +\committee[a]{Name of one of the main raporteurs} +\committee[a]{Name of the other main raporteur} +% Other members of the committee - include the Adviser in this list +\committee[v]{Another member of the committee} +\committee[v]{Yet another member of the committee} +\committee[v]{Yet another member of the committee} +\committee[v]{Yet another member of the committee} %%------------------------------------------------------------ %% All the names inside braces below sould correspond to a file @@ -245,7 +232,7 @@ \chapterfile{chapter1} \chapterfile{chapter2} \chapterfile{chapter3} -% \chapterfile{chapter4} +%\chapterfile{chapter4} % Text appendixes @@ -257,12 +244,18 @@ % BibTeX bibiography files. Can be used multiple times with a single file nae each time. \addbibfile{bibliography.bib} -%%============================================================ + + +%%==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== +%%==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== +%%==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== %% %% END OF USER COSTUMIZAITON %% Please do not change below this point!!! :) %% -%%============================================================ +%%==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== +%%==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== +%%==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== DANGER ==== %% Begining of document diff --git a/LaTeX/unlthesis.cls b/LaTeX/unlthesis.cls index 2f958b6e..15a1c9ea 100644 --- a/LaTeX/unlthesis.cls +++ b/LaTeX/unlthesis.cls @@ -38,7 +38,7 @@ % MSc preliminary report prepmsc % MSc dissertation msc % PhD proposal propphd -% PhD preliminary report prepphd +% PhD preliminary report phdplan % PhD thesis phd \DeclareOptionX{doctype}{ @@ -50,13 +50,11 @@ % -------------------------------------------------------- % MAIN LANGUAGE Only PT and EN are accepted for now % -% UNL@lang=? -% Portuguese 0 -% English 1 +% UNL@lang=[en,pt] \gdef\UNL@lang{en} \DeclareOptionX{lang}{ - \typeout{'lang'=#1} + % \typeout{'lang'=#1} \ifthenelse{\equal{#1}{pt}\OR\equal{#1}{PT}}{\gdef\UNL@lang{pt}\PassOptionsToPackage{english,portuguese}{babel}} {\ifthenelse{\equal{#1}{en}\OR\equal{#1}{EN}}{\gdef\UNL@lang{en}\PassOptionsToPackage{portuguese,english}{babel}}{ \PackageError{unlthesis}{Wrong value for option 'lang'}{Please see the documentation} @@ -65,6 +63,23 @@ } +% -------------------------------------------------------- +% COVER LANGUAGE Only PT and EN are accepted for now +% +% UNL@cover@lang=[en,pt] +% Defualts to the language of the thesis, but may be overriden by the option "coverlang" + +\gdef\UNL@cover@lang{\UNL@lang} +\DeclareOptionX{coverlang}{ + % \typeout{'coverlang'=#1} + \ifthenelse{\equal{#1}{pt}\OR\equal{#1}{PT}}{\gdef\UNL@cover@lang{pt}} + {\ifthenelse{\equal{#1}{en}\OR\equal{#1}{EN}}{\gdef\UNL@cover@lang{en}}{ + \PackageError{unlthesis}{Wrong value for option 'coverlang'}{Please see the documentation} + \expandafter\endinput + }} +} + + % -------------------------------------------------------- % linkscolor COLOR % @@ -294,6 +309,13 @@ \RequirePackage[backend=bibtex]{biblatex} +% To handle subfigures +\newsubfloat{figure} + +% Fix babel translation +\addto\captionsportuguese{\renewcommand{\contentsname}{Índice}} % Trocar "Conteúdo" por "Índice" +\addto\captionsportuguese{\renewcommand{\indexname}{Índice Remissivo}} % Trocar "Índice" por "Índice Remissivo" + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% GENERAL PURPOSE MACROS @@ -340,9 +362,9 @@ \newdata*{UNL@doctypestr} -\newdata*{UNL@jurytitlestr} -\newdata*{UNL@presidentstr} -\newdata*{UNL@refereestr} +\newdata*{UNL@committeetitlestr} +\newdata*{UNL@chairstr} +\newdata*{UNL@raporteurstr} \newdata*{UNL@memberstr} @@ -352,6 +374,32 @@ % Input definitions for strings above in multiple languages \InputIfFileExists{langsupport}{}{} + +\newdata*{university} +\newdata*{faculty} +\newdata*{majorfield} + +% Default cover background +\def\thesiscoverphd#1{% + \gdef\@thesiscoverphd{#1}} +\def\@thesiscoverphd{~thesiscoverphd \UNL@notdefined} + +\def\thesiscovermsc#1{% + \gdef\@thesiscovermsc{#1}} +\def\@thesiscovermsc{~thesiscovermsc \UNL@notdefined} + +\def\thesiscoverbsc#1{% + \gdef\@thesiscoverbsc{#1}} +\def\@thesiscoverbsc{~thesiscovermsc \UNL@notdefined} + +\def\thesiscoverplain#1{% + \gdef\@thesiscoverplain{#1}} +\def\@thesiscoverplain{~thesiscoverempty \UNL@notdefined} + +\InputIfFileExists{defaults}{}{} + + + % Portuguese \ifthenelse{\equal{\UNL@lang}{pt}} {\def\lstlistlistingname{Listagens}} @@ -369,7 +417,7 @@ \gdef\thecopyrightstr{% \thispagestyle{empty} \noindent -Copyright \copyright\ \@author, \@faculty, \@university +Copyright \copyright\ \@author, \faculty[\UNL@cover@lang], \university[\UNL@cover@lang] \bigskip \noindent @@ -380,55 +428,24 @@ Copyright \copyright\ \@author, \@faculty, \@university %% IDENTIFICATION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Default cover background -\def\thesiscoverphd#1{% - \gdef\@thesiscoverphd{#1}} -\def\@thesiscoverphd{~thesiscoverphd \UNL@notdefined} - -\def\thesiscovermsc#1{% - \gdef\@thesiscovermsc{#1}} -\def\@thesiscovermsc{~thesiscovermsc \UNL@notdefined} - -\def\thesiscoverbsc#1{% - \gdef\@thesiscoverbsc{#1}} -\def\@thesiscoverbsc{~thesiscovermsc \UNL@notdefined} - -\def\thesiscoverplain#1{% - \gdef\@thesiscoverplain{#1}} -\def\@thesiscoverplain{~thesiscoverempty \UNL@notdefined} - +% +% \def\majorfield#1{% +% \gdef\@majorfield{#1}} +% \def\@majorfield{~majorfield \UNL@notdefined} -% \def\university#1{% -% \gdef\@university{#1}} -% \def\@university{~university \UNL@notdefined} -% +% \def\address#1{% +% \gdef\@address{#1}} +% \def\@address{~address \UNL@notdefined} +% % \def\faculty#1{% % \gdef\@faculty{#1}} -% \def\@faculty{~faculty\UNL@notdefined} -% -% \def\department#1{% -% \gdef\@department{#1}} -% \def\@department{~department \UNL@notdefined} - -\def\majorfield#1{% - \gdef\@majorfield{#1}} -\def\@majorfield{~majorfield \UNL@notdefined} - -\def\address#1{% - \gdef\@address{#1}} -\def\@address{~address \UNL@notdefined} - -\def\faculty#1{% - \gdef\@faculty{#1}} -\def\@majorfield{~faculty \UNL@notdefined} - -\def\university#1{% - \gdef\@university{#1}} -\def\@majorfield{~university \UNL@notdefined} +% \def\@majorfield{~faculty \UNL@notdefined} +% +% \def\university#1{% +% \gdef\@university{#1}} +% \def\@majorfield{~university \UNL@notdefined} % \@input@{repeat} - -\@input@{defaults} %% Date \def\themonth#1{\gdef\@themonth{#1}} @@ -519,14 +536,14 @@ Copyright \copyright\ \@author, \@faculty, \@university } \def\printthejury{% - \begin{tabular}{ll} - & \UNL@jurytitlestr[\UNL@cover@lang]:\\ + \begin{tabular}{rl} + & \UNL@committeetitlestr[\UNL@cover@lang]:\\ \ifthenelse{\isundefined\UNL@jury@p@list}{}{% \listcssize{UNL@jury@p@list}% \ifthenelse{\equal{\the\UNL@listsize@cnt}{1}}% {\gdef\UNL@jury@n@p{1}}% {\gdef\UNL@jury@n@p{2}}% - \UNL@presidentstr[\UNL@jury@n@p,\UNL@cover@lang]: + \UNL@chairstr[\UNL@jury@n@p,\UNL@cover@lang]: \forlistcsloop{\UNL@do@jury@tabular}{UNL@jury@p@list} } \ifthenelse{\isundefined\UNL@jury@a@list}{}{% @@ -534,7 +551,7 @@ Copyright \copyright\ \@author, \@faculty, \@university \ifthenelse{\equal{\the\UNL@listsize@cnt}{1}}% {\gdef\UNL@jury@n@p{1}}% {\gdef\UNL@jury@n@p{2}}% - \UNL@refereestr[\UNL@jury@n@p,\UNL@cover@lang]: + \UNL@raporteurstr[\UNL@jury@n@p,\UNL@cover@lang]: \forlistcsloop{\UNL@do@jury@tabular}{UNL@jury@a@list} } \ifthenelse{\isundefined\UNL@jury@v@list}{}{% @@ -607,19 +624,20 @@ Copyright \copyright\ \@author, \@faculty, \@university % \newsavebox{\UNL@adviser@tabular@item@box} % \newlength{\UNL@adviser@tabular@item@box@w} \def\UNL@do@adviser@tabular@item#1,#2,#3{% - & \mbox{#1}, \mbox{#2}, \mbox{#3}% + & \parbox[t]{\linewidth}{\raggedright#1, #2, #3} + % & \mbox{#1}, \mbox{#2}, \parbox{\linewidth}{\mbox{}\\[-0.5ex]\raggedright#3}% } \def\UNL@do@adviser@tabular#1{% - \UNL@do@adviser@tabular@item#1\\[0pt]% + \UNL@do@adviser@tabular@item#1\\[5pt]% } \def\printtheadvisers{% % \begin{tabularx}{\linewidth}{lX<{\raggedright}} - \begin{tabu} spread 0pt {lX[1,l,p]}% + \begin{tabu} spread 0pt {rX[1,l,p]}% \ifthenelse{\isundefined\UNL@adviser@gender@list}{}{% \UNL@adviser@str{}: % - \forlistcsloop{\UNL@do@adviser@tabular}{UNL@adviser@list}\ % + \forlistcsloop{\UNL@do@adviser@tabular}{UNL@adviser@list}% }% \ifthenelse{\isundefined\UNL@coadviser@gender@list}{}{% & \\[-1.5ex]% @@ -637,25 +655,24 @@ Copyright \copyright\ \@author, \@faculty, \@university %% Draw the cover page %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Set cover language to Portuguese. -%% In the future this will be configurable, but not yet! :( -\def\UNL@cover@lang{pt} - - \def\coverpage{ \thispagestyle{empty} % \pagestyle{empty} %% Define cover page margins \ifthenelse{% - \equal{\UNL@doctype}{bsc}% - \OR\equal{\UNL@doctype}{prepmsc}% - \OR\equal{\UNL@doctype}{msc}}{% MSc + \equal{\UNL@doctype}{bsc}}{% BSc \def\@defcoverbg{\@thesiscoverbsc} \newgeometry{tmargin=4cm,bmargin=1.3cm,lmargin=4.5cm,rmargin=3.3cm} }{% \ifthenelse{% - \equal{\UNL@doctype}{prepphd}% + \equal{\UNL@doctype}{prepmsc}% + \OR\equal{\UNL@doctype}{msc}}{% MSc + \def\@defcoverbg{\@thesiscovermsc} + \newgeometry{tmargin=4cm,bmargin=1.3cm,lmargin=4.5cm,rmargin=3.3cm} + }{% +\ifthenelse{% + \equal{\UNL@doctype}{phdplan}% \OR\equal{\UNL@doctype}{propphd}% \OR\equal{\UNL@doctype}{phd}}{% PhD \def\@defcoverbg{\@thesiscoverphd} @@ -664,7 +681,7 @@ Copyright \copyright\ \@author, \@faculty, \@university { % Plain \def\@defcoverbg{\@thesiscoverplain} \newgeometry{tmargin=4cm,bmargin=1.3cm,lmargin=4.5cm,rmargin=3.3cm} -}} +}}} %% Add background image \AddToShipoutPicture*{\BackgroundPic{\@defcoverbg}} @@ -703,7 +720,7 @@ Copyright \copyright\ \@author, \@faculty, \@university \printtheadvisers \vfill\vfill -% Referee board +% raporteur board \ifthenelse{% \equal{\UNL@doctype}{bsc}% \OR\equal{\UNL@doctype}{msc}% diff --git a/README.md b/README.md index 65747f6a..950c8d1e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,13 @@ All contributors, both sporadic and regular, are welcome. :) Please [contact me] News ---- -*2015-01-23 — BSc reporting as well.* +*2015-07-01 — Better multilingual support.* ++ Fixed some translations to Portuguese in Babel. ++ Fixed declaration of copyright in Portuguese to follow the new spelling rules. ++ Better multilingual support (more language related things moved to "langsupport.tex" file file). ++ Renamed PhD thesis plan from "prepphd" to "phdplan". + +*2015-02-23 — BSc reporting as well.* + Improved support for BSc report. + Included a MSc like cover but with round corners.