[FE training-materials-updates] Labs, agenda: use TTF fonts
Alexandre Belloni
alexandre.belloni at free-electrons.com
Wed Sep 23 11:46:14 CEST 2015
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=69e301cec8c1ca85960c399df8600862e07527b5
>---------------------------------------------------------------
commit 69e301cec8c1ca85960c399df8600862e07527b5
Author: Alexandre Belloni <alexandre.belloni at free-electrons.com>
Date: Wed Sep 23 08:51:25 2015 +0200
Labs, agenda: use TTF fonts
Switch to the Liberation and Incosolata TTF fonts as it makes a clear
difference between O and 0 which helps for ttyO0 and between l and 1 for
zlib1g
In case switching to xelatex causes issues with the slides, use PDFLATEX =
pdflatex.
Signed-off-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>
>---------------------------------------------------------------
69e301cec8c1ca85960c399df8600862e07527b5
Makefile | 2 +-
README | 2 +-
agenda/android-agenda.tex | 1 -
agenda/autotools-agenda.tex | 1 -
agenda/boottime-agenda.tex | 1 -
agenda/buildroot-agenda.tex | 1 -
agenda/buildroot-fr-agenda.tex | 1 -
agenda/git-agenda.tex | 1 -
agenda/kernel-agenda.tex | 1 -
agenda/kernel-fr-agenda.tex | 1 -
agenda/sysdev-agenda.tex | 1 -
agenda/sysdev-fr-agenda.tex | 1 -
agenda/yocto-agenda.tex | 1 -
agenda/yocto-fr-agenda.tex | 1 -
common/agenda.sty | 8 +++++---
common/labs.sty | 10 +++++-----
16 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
index 9a66c71..b790559 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Needed tools
INKSCAPE = inkscape
-PDFLATEX = pdflatex
+PDFLATEX = xelatex
DIA = dia
EPSTOPDF = epstopdf
diff --git a/README b/README
index b4fa573..15d4735 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ First, you may install the packages needed to compile the materials:
sudo apt-get install git-core inkscape texlive-latex-base \
texlive-latex-extra texlive-font-utils dia python-pygments \
-texlive-fonts-recommended make
+texlive-fonts-recommended make texlive-xetex fonts-inconsolata
Then, run 'make help' to see what available targets are.
diff --git a/agenda/android-agenda.tex b/agenda/android-agenda.tex
index d0c69b6..d4c703b 100644
--- a/agenda/android-agenda.tex
+++ b/agenda/android-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Android System Development Training},
diff --git a/agenda/autotools-agenda.tex b/agenda/autotools-agenda.tex
index e865e3a..0cab023 100644
--- a/agenda/autotools-agenda.tex
+++ b/agenda/autotools-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Autotools training},
diff --git a/agenda/boottime-agenda.tex b/agenda/boottime-agenda.tex
index 4cc38f5..2ad1adc 100644
--- a/agenda/boottime-agenda.tex
+++ b/agenda/boottime-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Boot time optimization},
diff --git a/agenda/buildroot-agenda.tex b/agenda/buildroot-agenda.tex
index 3ae9877..5392519 100644
--- a/agenda/buildroot-agenda.tex
+++ b/agenda/buildroot-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Buildroot training},
diff --git a/agenda/buildroot-fr-agenda.tex b/agenda/buildroot-fr-agenda.tex
index e84dc70..afe752a 100644
--- a/agenda/buildroot-fr-agenda.tex
+++ b/agenda/buildroot-fr-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Buildroot training},
diff --git a/agenda/git-agenda.tex b/agenda/git-agenda.tex
index d35e0b5..56d2661 100644
--- a/agenda/git-agenda.tex
+++ b/agenda/git-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Git training},
diff --git a/agenda/kernel-agenda.tex b/agenda/kernel-agenda.tex
index 1a787ae..529fcbf 100644
--- a/agenda/kernel-agenda.tex
+++ b/agenda/kernel-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Embedded Linux kernel and driver development training},
diff --git a/agenda/kernel-fr-agenda.tex b/agenda/kernel-fr-agenda.tex
index 264afc2..77d5442 100644
--- a/agenda/kernel-fr-agenda.tex
+++ b/agenda/kernel-fr-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Formation développement noyau et pilotes Linux},
diff --git a/agenda/sysdev-agenda.tex b/agenda/sysdev-agenda.tex
index 1c26065..b97d438 100644
--- a/agenda/sysdev-agenda.tex
+++ b/agenda/sysdev-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Embedded Linux system development training},
diff --git a/agenda/sysdev-fr-agenda.tex b/agenda/sysdev-fr-agenda.tex
index e7c1d91..d71f79c 100644
--- a/agenda/sysdev-fr-agenda.tex
+++ b/agenda/sysdev-fr-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Développement de systèmes Linux embarqué},
diff --git a/agenda/yocto-agenda.tex b/agenda/yocto-agenda.tex
index fd883c3..9166446 100644
--- a/agenda/yocto-agenda.tex
+++ b/agenda/yocto-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Yocto Project and OpenEmbedded development training},
diff --git a/agenda/yocto-fr-agenda.tex b/agenda/yocto-fr-agenda.tex
index cbbc181..28b0eb0 100644
--- a/agenda/yocto-fr-agenda.tex
+++ b/agenda/yocto-fr-agenda.tex
@@ -3,7 +3,6 @@
\usepackage{agenda}
\usepackage{colortbl}
\usepackage{xcolor}
-\usepackage{palatino}
\usepackage{calc}
\hypersetup{pdftitle={Formation développement Linux embarqué avec Yocto Project et OpenEmbedded},
diff --git a/common/agenda.sty b/common/agenda.sty
index 3d2b5c5..e9fdb65 100644
--- a/common/agenda.sty
+++ b/common/agenda.sty
@@ -1,5 +1,4 @@
-\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage[normalem]{ulem}
\usepackage[vmargin=2cm, hmargin=1.5cm]{geometry}
@@ -18,7 +17,11 @@
\usepackage{tabularx}
% A nicer font
-\usepackage{palatino}
+\usepackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX}
+\setmainfont{Liberation Serif}
+\setsansfont{Liberation Sans}
+\setmonofont{Liberation Mono}
%% Remove indentation on the first line of each paragraph, and add
%% some space between each paragraph.
@@ -39,7 +42,6 @@
\renewcommand{\footrulewidth}{0.5pt}
\setlength{\headheight}{60pt}
-\setlength{\textheight}{670px}
\definecolor{textcolor}{HTML}{4B6FA9}
diff --git a/common/labs.sty b/common/labs.sty
index dcf92a3..5387f17 100644
--- a/common/labs.sty
+++ b/common/labs.sty
@@ -5,7 +5,11 @@
\usepackage{parskip}
%% Use a more modern, and less LaTeX-old-style-looking font.
-\usepackage{palatino}
+\usepackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX}
+\setmainfont{Liberation Serif}
+\setsansfont{Liberation Sans}
+\setmonofont{Inconsolata}
%% Use more reasonable margins. We keep a different outer margin than
%% the inner margin so that the holes needed for the binders are
@@ -26,8 +30,6 @@
\usepackage{upquote}
% Extensions
-\RequirePackageWithOptions{inputenc}
-
\RequirePackage{fancyhdr}
\RequirePackage{hyperref}
\RequirePackage{wrapfig}
@@ -111,8 +113,6 @@
\renewcommand{\footrulewidth}{0.5pt}
}
-\setlength{\textheight}{630px}
-
\let\cleardoublepage\clearpage
%% Defining our customs commands
More information about the training-materials-updates
mailing list