From cc1b9bab6a0f669fd73d0f98dbad93ed9af2c086 Mon Sep 17 00:00:00 2001
From: Thomas Pietrzak <thomas.pietrzak@gmail.com>
Date: Wed, 21 Apr 2021 11:33:24 +0200
Subject: [PATCH] Fonts

---
 hdrmain.tex     |  2 --
 mystyle.sty     | 38 ++++++++++++++++++++++++++++++--------
 tex/0-titre.tex |  4 ++--
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/hdrmain.tex b/hdrmain.tex
index 80265c3..7f84615 100644
--- a/hdrmain.tex
+++ b/hdrmain.tex
@@ -1,7 +1,5 @@
 \documentclass[10pt,a4paper,twoside,titlepage,openbib]{phdthesis}
 
-\usepackage[utf8]{inputenc}
-
 \usepackage{getcommit}
 \usepackage{xstring}
 \usepackage[ddmmyyyy,hhmmss]{datetime}
diff --git a/mystyle.sty b/mystyle.sty
index 3fc0865..e541e44 100644
--- a/mystyle.sty
+++ b/mystyle.sty
@@ -7,20 +7,42 @@
 \usepackage{tikz}
 \usetikzlibrary{arrows.meta,arrows,positioning}
 \usepackage{booktabs}
+\usepackage{ifxetex}
 
+\usepackage[Latin,Greek]{ucharclasses}
+\ifXeTeX
+  \usepackage{fontspec}
+  \usepackage{xunicode}
+  \usepackage{xltxtra}
+  \usepackage{palatino}
+  \defaultfontfeatures{Mapping=tex-text}
+
+  %\newfontfamily\mynormal{Palatino}% Linotype}
+  \newfontfamily\mynormal{Optima}[SmallCapsFont={Palatino}]% Linotype}
+  % font-computer-modern
+  \newfontfamily\mygreek{CMU Serif}
+  \setTransitionsForGreek{\mygreek}{}
+  %\setDefaultTransitions{\mynormal}{}
+
+  \setmainfont{Optima}[SmallCapsFont={Palatino}]
+  \setsansfont{Optima}[SmallCapsFont={Palatino}]
+  \setmonofont[Contextuals={Alternate}]{Fira Code}
+\else
+  \usepackage[utf8]{inputenc}
+  \usepackage[T1]{fontenc}
+  \usepackage{mathpazo,courier,euler}
+  \usepackage[scaled=.92]{helvet}
+\fi
 %fonts
 % font-latin-modern
 %\usepackage{tgadventor}
 %\usepackage{lmodern}
-\usepackage{palatino}
+%\usepackage{palatino}
+%\usepackage{optima}
+%\usepackage[sfdefault]{classico}
 
-\usepackage[Latin,Greek]{ucharclasses}
-\usepackage{fontspec}
-\newfontfamily\mynormal{Palatino}% Linotype}
-\setDefaultTransitions{\mynormal}{}
-% font-computer-modern
-\newfontfamily\mygreek{CMU Serif}
-\setTransitionsForGreek{\mygreek}{}
+%\usepackage{fontspec}
+%\setmainfont{QTOptimum}
 
 \usepackage{graphicx}
 \usepackage{epigraph}
diff --git a/tex/0-titre.tex b/tex/0-titre.tex
index 1f99cb1..3a6a506 100644
--- a/tex/0-titre.tex
+++ b/tex/0-titre.tex
@@ -21,8 +21,8 @@
   \begin{center}
     \vspace{10mm}
     \raggedright
-    Département Informatique\hfill École Doctorale SPI\\
-    Faculté de Sciences et Technologies%\hfill
+    Faculté de Sciences et Technologies\hfill École Doctorale SPI\\
+    Département Informatique%\hfill
   \end{center}
   \end{textblock*}
 
-- 
2.30.2