aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/10_fonts.tex7
-rw-r--r--common/Makefile.common6
2 files changed, 9 insertions, 4 deletions
diff --git a/common/10_fonts.tex b/common/10_fonts.tex
index 17df6e1..11e2a8e 100644
--- a/common/10_fonts.tex
+++ b/common/10_fonts.tex
@@ -1,11 +1,12 @@
\usepackage{fontspec}
\newfontfamily\CaviarDreamsFont{CaviarDreams}
- [ Path=../fonts/
- , BoldFont = *_Bold,
+ [ Path=\commonPath/../fonts/
+ , BoldFont = CaviarDreams_Bold
, Mapping=tex-text
+ , Extension = .ttf
]
\newfontfamily\LibertineFont{Linux Libertine O}
- [ Mapping=tex-text
+ [ Ligatures=TeX
]
diff --git a/common/Makefile.common b/common/Makefile.common
index d739a5e..a05db25 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -60,7 +60,11 @@ tmp:
# Hack used to identify the path to the shared configuration in latex.
tmp/model.tex: | tmp
- $(file >$@,\def\commonPath{$(MODEL)/../common/})
+ # Transform the path to the model into an absolute path, because this path
+ # will be used in the lualatex cache to references the fonts, and using
+ # relative path can cause issues if we need to references the font from
+ # another location.
+ $(file >$@,\def\commonPath{$(abspath $(MODEL)/../common/)})
# Generate the latex file from rst
tmp/%.tex: %.rst $(INCLUDED_PDF) $(SOURCES) | tmp