1 files changed, 68 insertions, 51 deletions

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 <emmanuel.rousseaux@gmail.com>
+%% Copyright (C) 2014-2015 by Emmanuel Rousseaux <emmanuel.rousseaux@gmail.com>
 %% 
 %% 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}