Fonts

diff --git a/hdrmain.tex b/hdrmain.tex
index 80265c3e521862b58f48e1e5d9928f4c0fb21dc5..7f84615b3165885c3bedd2becacd84630347cc98 100644 (file)
--- a/hdrmain.tex
+++ b/hdrmain.tex
@@ -1,7 +1,5 @@
 \documentclass[10pt,a4paper,twoside,titlepage,openbib]{phdthesis}\r
 \r
-\usepackage[utf8]{inputenc}\r
-\r
 \usepackage{getcommit}\r
 \usepackage{xstring}\r
 \usepackage[ddmmyyyy,hhmmss]{datetime}\r

diff --git a/mystyle.sty b/mystyle.sty
index 3fc086516783a14c3836fa9ff20e9d815fc85f53..e541e445bb8631a4f47d7c891b0b1a79aadcda4c 100644 (file)
--- 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 1f99cb10cd71e2fafda7e74dce5f8c35528b1c5a..3a6a50693b2a23c1e292f38ecd6abd4a2915f12d 100644 (file)
--- 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*}