From ccbd09808e690b9ae58975076e645cd00dd6d2c3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Feb 2015 22:42:38 +0000 Subject: gsemthesis (9feb15) git-svn-id: svn://tug.org/texlive/trunk@36244 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/gsemthesis/gsemthesis.pdf | Bin 268994 -> 296404 bytes .../source/latex/gsemthesis/gsemthesis.dtx | 307 ++++++++++++--------- .../source/latex/gsemthesis/gsemthesis.ins | 4 +- .../texmf-dist/tex/latex/gsemthesis/gsemthesis.cls | 119 ++++---- 4 files changed, 251 insertions(+), 179 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/gsemthesis/gsemthesis.pdf b/Master/texmf-dist/doc/latex/gsemthesis/gsemthesis.pdf index 59eb2e4f31c..f06962c958a 100644 Binary files a/Master/texmf-dist/doc/latex/gsemthesis/gsemthesis.pdf and b/Master/texmf-dist/doc/latex/gsemthesis/gsemthesis.pdf differ diff --git a/Master/texmf-dist/source/latex/gsemthesis/gsemthesis.dtx b/Master/texmf-dist/source/latex/gsemthesis/gsemthesis.dtx index 791fe30c40c..569b7599420 100644 --- a/Master/texmf-dist/source/latex/gsemthesis/gsemthesis.dtx +++ b/Master/texmf-dist/source/latex/gsemthesis/gsemthesis.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (©) 2015 by Emmanuel Rousseaux +% Copyright (©) 2014-2015 by Emmanuel Rousseaux % ------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -20,7 +20,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{gsemthesis} %<*class> - [2015/01/16 v0.9.3 .dtx gsemthesis file] + [2015/02/09 v0.9.4 .dtx gsemthesis file] % % %<*driver> @@ -33,6 +33,13 @@ \hypersetup{colorlinks=true, linkcolor=black, filecolor=erblue, citecolor=erblue, urlcolor=erblue} \RequirePackage{url} \RequirePackage{float} +\newenvironment{itemize*}% + {\vspace{-2mm}\begin{itemize}% + \setlength{\itemsep}{0pt}% + \setlength{\parskip}{0pt}% + }% + {\end{itemize}\vspace{-2mm}% + } \EnableCrossrefs \CodelineIndex \RecordChanges @@ -66,6 +73,7 @@ % \changes{v0.9.1}{2014/12/06}{French option, draft option, update frontmatter, update backmatter, page numbering at the top of the page, refined cover page} % \changes{v0.9.2}{2015/01/09}{rewriting of the cover page, improve bibliography management, and a lot of minor fixes} % \changes{v0.9.3}{2015/01/16}{tested requirements on Debian and Windows, added the minimal working example, first complete version of the user manual} +% \changes{v0.9.4}{2015/02/09}{fixed RO-LE headers, custombib, graphicx and hyperref in final mode, utf-8, French T1, and a lot of minor fixes} % % \GetFileInfo{gsemthesis.dtx} % @@ -92,11 +100,11 @@ % \section{Introduction} % % PhD thesis published within the Geneva School of Economics and Management have to follows some guidelines, especially for the cover page. The |gsemthesis| class is a \LaTeX{} template providing utilities to easily set up these guidelines in your thesis. In addition the class loads several usefull packages generally used when writing a thesis. -% We recommend the user to have a look to the class definition in Section \ref{sec:classdef} to be aware of the list of packages that the class already includes. The Section \ref{sec:usage} details how to start with the |gsemthesis| class and how to configure your thesis. The user interested in customizing the class can read the Section \ref{sec:implementation} which details the full implementation of the class with usefull comments. +% We recommend the user to have a look to the class definition in Section \ref{sec:classdef} to be aware of the list of packages that the class already includes. The Section \ref{sec:usage} details how to start with the |gsemthesis| class and how to configure your thesis. The Section \ref{sec:example} provides a minimal working example you can copy/paste for starting your dissertation. The user interested in customizing the class can read the Section \ref{sec:implementation} which details the full implementation of the class with usefull comments. % % \medskip % -% This class was successfully tested with pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) and with pdfTeX Version 3.14159265-2.6-1.40.15 (TeX Live 2014/Windows). +% This class was successfully tested with TeX Live 2013/Debian, TeX Live 2014/CentOS;Windows7 and MiKTeX-2.9.5105/Windows7. % % \medskip % @@ -113,7 +121,7 @@ % % \subsection{Requirements} % -% The class requires a recent version of either TeX Live ($\ge$ 2013) or MikTeX ($\ge$ 2.9.5x). As the class preload some common packages (see Section \ref{sec:implementation} for the detailed list), we suggest to use install your \LaTeX{} distribution in full mode to make things working out-of-the-box. +% The class requires a recent version of either TeX Live ($\ge$ 2014 recommended, $\ge$ 2013 minimal) or MiKTeX ($\ge$ 2.9.5x minimal). As the class preload some common packages (see Section \ref{sec:implementation} for the detailed list), we suggest to use install your \LaTeX{} distribution in full mode to make things working out-of-the-box. % % \medskip % @@ -131,7 +139,12 @@ % \end{document} % \end{verbatim} % -% \noindent The Section \ref{sec:example} provides a minimal working example you can copy/paste for starting your dissertation. The commands used are explained in the following sections. +% \noindent The Section \ref{sec:example} provides a minimal working example you can copy/paste for starting your dissertation. Commands available for configuring your thesis are explained in the following sections. +% +% \subsection{Configuring your editor to store files in UTF-8} +% +% The class assumes that all your |.tex| and |.bib| files are encoded in UTF-8. The UTF-8 encoding is a dominant character encoding available on all recent systems and used by default by a lot of editors. As a consequence, it limits encoding problems when sharing files from different systems (Windows, MacOS, Unix/Linux, web sites, etc.). If some of your source files are stored with a different encoding, you may experience rendering problems with accentued/foreign characters. These characters can occur, for instance, in author names of the bibliography. For making sure you won't experience rendering problems, consider (1) storing your files in UTF-8 and (2) set UTF-8 as the default encoding of your editor. +% Any recent text editor is able to convert files to UTF-8. TeXstudio and TeXmaker seem to used UTF-8 by default. Rstudio seems to use the system default encoding. To change this setting go to \emph{File $>$ Save with encoding}. On NotePad++ go to \emph{Encoding $>$ Convert to UTF-8}. % % \subsection{Writing the dissertation in French} % @@ -183,31 +196,31 @@ % % \subsubsection{Configure TeXstudio to run biber} % -% In the TeXstudio preferences (click on Options $\rightarrow$ Configure TeXstudio), choose the `Build' tab and modify the `Default Bibliography’ to `Biber’. +% In the TeXstudio preferences (click on Options $\rightarrow$ Configure TeXstudio), choose the `Build' tab and modify the `Default Bibliography' to `Biber'. % % \medskip % -% \noindent Run `Build \& View’ from the `Tools’ menu (or press the two green arrows icon), which will create a PDF but with the bibliography not completed. +% \noindent Run `Build \& View' from the `Tools' menu (or press the two green arrows icon), which will create a PDF but with the bibliography not completed. % % \medskip % -% \noindent Run `Bibliography’ from the `Tools’ menu. +% \noindent Run `Bibliography' from the `Tools' menu. % % \medskip % -% \noindent Run `Build \& View’ again to create a PDF with the bibliography. +% \noindent Run `Build \& View' again to create a PDF with the bibliography. % % \subsubsection{Configure Texmaker to run biber} % -% In the Texmaker preferences (click on Options $\rightarrow$ Configure Texmaker), choose the `Commands’ tab and replace |bibtex %| by |biber %| in the field |Bib(la)tex|. On Windows, you may also browse to the |biber.exe| using the folder icon on the side. +% In the Texmaker preferences (click on Options $\rightarrow$ Configure Texmaker), choose the `Commands' tab and replace |bibtex %| by |biber %| in the field |Bib(la)tex|. On Windows, you may also browse to the |biber.exe| using the folder icon on the side. % % \medskip % -% \noindent Choose the `Quick Build’ tab and select the second option |PdfLaTeX + Bib(la)tex +| |PdfLaTex (x2) + View Pdf| +% \noindent Choose the `Quick Build' tab and select the second option |PdfLaTeX + Bib(la)tex +| |PdfLaTex (x2) + View Pdf| % % \medskip % -% \noindent Now your `Quick Build’ button will create a PDF with the bibliography. +% \noindent Now your `Quick Build' button will create a PDF with the bibliography. % % \subsubsection{Configure Rstudio/knitr to run biber} % @@ -227,12 +240,21 @@ % % To add a bibliography into your document, you have to define your bib file in the preamble of your tex file: |\addbibresource{literature-review-topic1.bib}| Then, at the end of your document, the command |\printbibliography| will create the biblography. % +% \subsubsection{Using you own bibliography management configuration} +% +% If you prefer not to use the bibliography management configuration we implemented in this class, you can disabled it and writing you own. Disabling the \emph{gsemthesis} bibliography management configuration is easily done with the |custombib| class option: +% \begin{verbatim} +% \documentclass[custombib]{gsemthesis} +% \end{verbatim} +% When using this option you will have to provide the package you want to use for managing your bibliography (|natbib|, |chapterbib|, etc.). As the option disables all settings you will also need to load the package |biblatex| if you want to use it. +% % \subsection{\emph{Draft} mode} % % When sharing draft versions of your dissertation you may prefer to hide some items of the cover page (thesis committee, thesis number, etc.) and some Sections (acknowledgments, the dedications. etc.) that probably have not been defined yet. For this purpose you can use the |draft| option: % \begin{verbatim} % \documentclass[draft]{gsemthesis} % \end{verbatim} +% \noindent\emph{Note:} this draft mode extends the classical \LaTeX draft mode and then all packages supporting a draft mode will also switch to the draft mode\footnote{Common packages supporting a draft mode are: |changes| (final disables markup of changes, and list of changes), |graphics| (draw frames instead of including images), |graphicx| (draw frames instead of including images), |hyperref| (disable all linking features), |listings| (don't include external files), |listofsymbols| (final suppresses printing of macro names and unused symbols), |mfpic| (assume every latex run to be the first one), |microtype| (disable all features), |pdfcomment| (final suppresses the comments), |pdfpages| (don't include external file but print a frame box), |pgf| (similar to graphics/x: all images will be replaced by empty rectangles), |showkeys| (draft shows the labels, the default option), |thumbs| (thumbs' width=2pt, thumbs' text=black, thumbs' color=grey), |varioref| (turn warnings in error messages). \emph{Source:} \url{http://tex.stackexchange.com/questions/49277/what-does-the-draft-mode-change/49278}}. For convenience purposes we forced packages |graphicx| and |hyperref| to be in \emph{final} mode even when draft mode is on. % % \subsection{Miscellaneous} % @@ -241,6 +263,68 @@ % The default |itemize| environment set important spaces between each items, the previous paragraph and the next paragraph. The |itemize*| environment reduces these spaces to allow a more compact (and nicer) presentation of a list item. % \emph{Forthcoming}. To add: section in redaction, todonotes % +% \newpage +% \section{Minimal working example} +% \label{sec:example} +% \begin{verbatim} +% \documentclass{gsemthesis} +% +% \title{An innovative approach to deal with a very important issue} +% \date{\today} +% \authorFirstname{Firstname} +% \authorLastname{Lastname} +% \thesisField{Econometrics} +% +% \thesisCommitteeA{Prof.}{Mike}{Moore}{Adviser, University of Geneva} +% \thesisCommitteeB{Prof.}{Mike}{Moore}{Chair, University of Honolulu} +% \thesisCommitteeC{Prof.}{Mike}{Moore}{University of Omsk} +% \thesisCommitteeD{Dr.}{Mike}{Moore}{Eidgenössische Technische Hochschule Zürich} +% \thesisNumber{480} +% +% \acknowledgements{Your acknowledgements} +% +% \abstractEN{English version of the abstract} +% +% \abstractFR{French version of the abstract} +% +% \dedication{To my family.} +% +% \addbibresource{literature-review-topic1.bib} +% \addbibresource{literature-review-topic2.bib} +% +% \begin{document} +% +% \printcoverpage +% +% \printfrontmatter +% +% % INTRODUCTION +% \startintroduction +% +% Write your introduction here. +% +% % CHAPTER +% \chapter{A first chapter} +% \label{ch:chapterone} +% +% My chapter 1. +% +% % CONCLUSION +% \startconclusion +% +% The conclusion. +% +% % BACKMATTER +% \listoftables +% \listoffigures +% +% % Bibliography (at the end) +% \newpage +% \printbibliography +% +% \end{document} +% \end{verbatim} +% % \section{Implementation} % \label{sec:implementation} % @@ -275,7 +359,17 @@ \newtoggle{draft} \DeclareOption{draft}{\toggletrue{draft}} % \end{macrocode}% -% We process options we just defined +% We add the option \emph{custombib} +% \begin{macrocode} +\newtoggle{custombib} +\DeclareOption{custombib}{\toggletrue{custombib}} +% \end{macrocode}% +% The recommended page format is A4. The B5 page format is given in option. +% \begin{macrocode} +\DeclareOption{b5paper}{ + \PassOptionsToClass{\CurrentOption}{book} +} +% \end{macrocode}% % \begin{macrocode} \ProcessOptions % \end{macrocode}% @@ -299,7 +393,7 @@ % \subsection{Graphics} % We add some practical packages to handle several image files (.png, .pdf), handle placement of graphics, and handle subfigures % \begin{macrocode} -\usepackage{graphicx} +\usepackage[final]{graphicx} \usepackage{float} \usepackage{subfigure} % \end{macrocode} @@ -314,13 +408,14 @@ % citecolor=gsemblue,% % urlcolor=gsemblue% % }% -\hypersetup{% -colorlinks=true,% -linkcolor=black,% -filecolor=erblue,% -citecolor=erblue,% -urlcolor=erblue% -}% +\hypersetup{ + colorlinks=true, + linkcolor=black, + filecolor=erblue, + citecolor=erblue, + urlcolor=erblue, + final +} % \end{macrocode} % We use the |url| package for a complete support of external links and define a nice font style. % \begin{macrocode} @@ -333,16 +428,28 @@ urlcolor=erblue% \usepackage{amssymb,amsmath,amsfonts} % \end{macrocode} % \subsection{Page headers management} -% We use the |fancyhdr| package for a fine tuning of headers and footers of the different page type (cover page, chapters, unumbered chapters, etc.) +% We use the |fancyhdr| package for a fine tuning of headers and footers of the different page type (cover page, chapters, unumbered chapters, etc.). % \begin{macrocode} \usepackage{fancyhdr} % \end{macrocode} +% The capital letters given in option of |\fancyhead| or |\fancyfoot| commands respectively stands for: +% \begin{itemize*} +% \item E: Even page +% \item O: Odd page +% \item L: Left field +% \item C: Center field +% \item R: Right field +% \item H: Header +% \item F: Footer +% \end{itemize*} % We set the |fancy| page style (default page style) as follows: % \begin{macrocode} \pagestyle{fancy} \fancyhf{} -\fancyhead[LO]{\thepage\hfill\nouppercase{\leftmark}} -\fancyhead[RE]{\nouppercase{\rightmark}\hfill\thepage} +\fancyhead[LE]{\thepage} +\fancyhead[RE]{\nouppercase{\leftmark}} +\fancyhead[LO]{\nouppercase{\rightmark}} +\fancyhead[RO]{\thepage} \fancyfoot[LE,RO]{} % \end{macrocode} % We reset the |plain| style @@ -367,8 +474,10 @@ urlcolor=erblue% \fancyhf{} \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} - \fancyhead[LO]{\nouppercase{\leftmark}} - \fancyhead[RE]{\nouppercase{\rightmark}} + \fancyhead[LE]{\thepage} + \fancyhead[RE]{} + \fancyhead[LO]{} + \fancyhead[RO]{\thepage} \fancyfoot[LE,RO]{} } % \end{macrocode} @@ -393,6 +502,7 @@ urlcolor=erblue% % \begin{macrocode} \iftoggle{fr}{ \usepackage[francais]{babel} + \usepackage[T1]{fontenc} }{ \usepackage[english]{babel} } @@ -410,45 +520,49 @@ urlcolor=erblue% % \subsection{Bibliography management} % We use biblatex/biber to process the bibliography with the following settings: (1) citations with more than two authors will always be writen as ``First author et al.'', (2) this ``et al.'' rule is applied even if it leads to ambiguities between long list of authors with the same first author. % \begin{macrocode} -\usepackage[backend=biber,natbib=true,style=authoryear-comp,sorting=nymdt,% -maxbibnames=99,mincitenames=1,maxcitenames=2,uniquelist=false]{biblatex} +\iftoggle{custombib}{}{ + \usepackage[backend=biber,natbib=true,style=authoryear-comp,sorting=nymdt,% + maxbibnames=99,mincitenames=1,maxcitenames=2,uniquelist=false]{biblatex} +} % \end{macrocode} % We use the style authoryear to print authors and the year when citing a document in the text. We define a customized sorting style to sort the list of references (printed at the end of the document) according to this (ordered) attributes: name, year, month, day, and title. % We define the following sorting scheme: % \begin{macrocode} -\DeclareSortingScheme{nymdt}{ - \sort{ - \field{presort} - } - \sort[final]{ - \field{sortkey} - } - \sort{ - \name{sortname} - \name{author} - \name{editor} - \name{translator} - \field{sorttitle} - \field{title} - } - \sort{ - \field{sortyear} - \field{year} - } - \sort{ - \field[padside=left,padwidth=2,padchar=0]{month} - \literal{00} - } - \sort{ - \field[padside=left,padwidth=2,padchar=0]{day} - \literal{00} - } - \sort{ - \field{sorttitle} - } - \sort{ - \field[padside=left,padwidth=4,padchar=0]{volume} - \literal{0000} +\iftoggle{custombib}{}{ + \DeclareSortingScheme{nymdt}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \name{sortname} + \name{author} + \name{editor} + \name{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field[padside=left,padwidth=2,padchar=0]{month} + \literal{00} + } + \sort{ + \field[padside=left,padwidth=2,padchar=0]{day} + \literal{00} + } + \sort{ + \field{sorttitle} + } + \sort{ + \field[padside=left,padwidth=4,padchar=0]{volume} + \literal{0000} + } } } % \end{macrocode} @@ -658,9 +772,11 @@ maxbibnames=99,mincitenames=1,maxcitenames=2,uniquelist=false]{biblatex} } } - \vspace*{0.8cm} - - \iftoggle{draft}{~}{\thesisCommitteeLabel} + \iftoggle{draft}{~}{ + \vspace*{0.8cm} + + \thesisCommitteeLabel + } \vspace*{0.2em} @@ -849,66 +965,5 @@ maxbibnames=99,mincitenames=1,maxcitenames=2,uniquelist=false]{biblatex} % \end{macrocode} % \end{environment} % -% \newpage -% \section{Minimal working example} -% \label{sec:example} -% \begin{verbatim} -% \documentclass{gsemthesis} -% -% \title{An innovative approach to deal with a very important issue} -% \date{\today} -% \authorFirstname{Firstname} -% \authorLastname{Lastname} -% \thesisField{Econometrics} -% -% \thesisCommitteeA{Prof.}{Mike}{Moore}{Advisor, University of Geneva} -% \thesisCommitteeB{Prof.}{Mike}{Moore}{Chair, University of Honolulu} -% \thesisCommitteeC{Prof.}{Mike}{Moore}{University of Omsk} -% \thesisCommitteeD{Dr.}{Mike}{Moore}{Eidgenössische Technische Hochschule Zürich} -% \thesisNumber{480} -% -% \acknowledgements{Your acknowledgements} -% -% \abstractEN{English version of the abstract} -% -% \abstractFR{French version of the abstract} -% -% \dedication{To my family.} -% -% \addbibresource{literature-review-topic1.bib} -% \addbibresource{literature-review-topic2.bib} -% -% \begin{document} -% -% \printcoverpage -% -% \printfrontmatter -% -% % INTRODUCTION -% \startintroduction -% -% Write your introduction here. -% -% % CHAPTER -% \chapter{A first chapter} -% \label{ch:chapterone} -% -% My chapter 1. -% -% % CONCLUSION -% \startconclusion -% -% The conclusion. -% -% % BACKMATTER -% \listoftables -% \listoffigures -% -% % Bibliography (at the end) -% \newpage -% \printbibliography -% -% \end{document} -% \end{verbatim} % \Finale \endinput \ No newline at end of file diff --git a/Master/texmf-dist/source/latex/gsemthesis/gsemthesis.ins b/Master/texmf-dist/source/latex/gsemthesis/gsemthesis.ins index 07aa62ca49c..152d6acd3e4 100644 --- a/Master/texmf-dist/source/latex/gsemthesis/gsemthesis.ins +++ b/Master/texmf-dist/source/latex/gsemthesis/gsemthesis.ins @@ -1,5 +1,5 @@ %% -% Copyright (©) 2015 by Emmanuel Rousseaux +% Copyright (©) 2014-2015 by Emmanuel Rousseaux % ------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -20,7 +20,7 @@ This is a generated file. -Copyright (C) 2015 by Emmanuel Rousseaux +Copyright (C) 2014-2015 by Emmanuel Rousseaux This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, version 1.3c diff --git a/Master/texmf-dist/tex/latex/gsemthesis/gsemthesis.cls b/Master/texmf-dist/tex/latex/gsemthesis/gsemthesis.cls index beaedd5e8af..7bfb62b3e00 100644 --- a/Master/texmf-dist/tex/latex/gsemthesis/gsemthesis.cls +++ b/Master/texmf-dist/tex/latex/gsemthesis/gsemthesis.cls @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2015 by Emmanuel Rousseaux +%% Copyright (C) 2014-2015 by Emmanuel Rousseaux %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, version 1.3c @@ -19,7 +19,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{gsemthesis} - [2015/01/16 v0.9.3 .dtx gsemthesis file] + [2015/02/09 v0.9.4 .dtx gsemthesis file] \LoadClass[a4paper,12pt,twoside]{book} \usepackage[utf8]{inputenc} \usepackage{lmodern} @@ -28,6 +28,11 @@ \DeclareOption{fr}{\toggletrue{fr}} \newtoggle{draft} \DeclareOption{draft}{\toggletrue{draft}} +\newtoggle{custombib} +\DeclareOption{custombib}{\toggletrue{custombib}} +\DeclareOption{b5paper}{ + \PassOptionsToClass{\CurrentOption}{book} +} \ProcessOptions \RequirePackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} \usepackage{setspace} @@ -35,25 +40,28 @@ \definecolor{erblue}{HTML}{126199} \definecolor{erorange}{HTML}{FF7F00} \definecolor{gsemblue}{HTML}{465F7F} -\usepackage{graphicx} +\usepackage[final]{graphicx} \usepackage{float} \usepackage{subfigure} \RequirePackage{hyperref} -\hypersetup{% -colorlinks=true,% -linkcolor=black,% -filecolor=erblue,% -citecolor=erblue,% -urlcolor=erblue% -}% +\hypersetup{ + colorlinks=true, + linkcolor=black, + filecolor=erblue, + citecolor=erblue, + urlcolor=erblue, + final +} \RequirePackage{url} \urlstyle{sf} \usepackage{amssymb,amsmath,amsfonts} \usepackage{fancyhdr} \pagestyle{fancy} \fancyhf{} -\fancyhead[LO]{\thepage\hfill\nouppercase{\leftmark}} -\fancyhead[RE]{\nouppercase{\rightmark}\hfill\thepage} +\fancyhead[LE]{\thepage} +\fancyhead[RE]{\nouppercase{\leftmark}} +\fancyhead[LO]{\nouppercase{\rightmark}} +\fancyhead[RO]{\thepage} \fancyfoot[LE,RO]{} \fancypagestyle{plain}{ \fancyhf{} @@ -69,8 +77,10 @@ urlcolor=erblue% \fancyhf{} \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} - \fancyhead[LO]{\nouppercase{\leftmark}} - \fancyhead[RE]{\nouppercase{\rightmark}} + \fancyhead[LE]{\thepage} + \fancyhead[RE]{} + \fancyhead[LO]{} + \fancyhead[RO]{\thepage} \fancyfoot[LE,RO]{} } \fancypagestyle{empty}{ @@ -86,47 +96,52 @@ urlcolor=erblue% \clearpage{\pagestyle{empty}\cleardoublepage} \iftoggle{fr}{ \usepackage[francais]{babel} + \usepackage[T1]{fontenc} }{ \usepackage[english]{babel} } \usepackage{csquotes} \usepackage{datetime} \newdateformat{monthyeardate}{\monthname[\THEMONTH] \THEYEAR} -\usepackage[backend=biber,natbib=true,style=authoryear-comp,sorting=nymdt,% -maxbibnames=99,mincitenames=1,maxcitenames=2,uniquelist=false]{biblatex} -\DeclareSortingScheme{nymdt}{ - \sort{ - \field{presort} - } - \sort[final]{ - \field{sortkey} - } - \sort{ - \name{sortname} - \name{author} - \name{editor} - \name{translator} - \field{sorttitle} - \field{title} - } - \sort{ - \field{sortyear} - \field{year} - } - \sort{ - \field[padside=left,padwidth=2,padchar=0]{month} - \literal{00} - } - \sort{ - \field[padside=left,padwidth=2,padchar=0]{day} - \literal{00} - } - \sort{ - \field{sorttitle} - } - \sort{ - \field[padside=left,padwidth=4,padchar=0]{volume} - \literal{0000} +\iftoggle{custombib}{}{ + \usepackage[backend=biber,natbib=true,style=authoryear-comp,sorting=nymdt,% + maxbibnames=99,mincitenames=1,maxcitenames=2,uniquelist=false]{biblatex} +} +\iftoggle{custombib}{}{ + \DeclareSortingScheme{nymdt}{ + \sort{ + \field{presort} + } + \sort[final]{ + \field{sortkey} + } + \sort{ + \name{sortname} + \name{author} + \name{editor} + \name{translator} + \field{sorttitle} + \field{title} + } + \sort{ + \field{sortyear} + \field{year} + } + \sort{ + \field[padside=left,padwidth=2,padchar=0]{month} + \literal{00} + } + \sort{ + \field[padside=left,padwidth=2,padchar=0]{day} + \literal{00} + } + \sort{ + \field{sorttitle} + } + \sort{ + \field[padside=left,padwidth=4,padchar=0]{volume} + \literal{0000} + } } } \def\theFaculty{Geneva School of Economics and Management} @@ -261,9 +276,11 @@ maxbibnames=99,mincitenames=1,maxcitenames=2,uniquelist=false]{biblatex} } } - \vspace*{0.8cm} + \iftoggle{draft}{~}{ + \vspace*{0.8cm} - \iftoggle{draft}{~}{\thesisCommitteeLabel} + \thesisCommitteeLabel + } \vspace*{0.2em} -- cgit v1.2.3