Skip to content

Commit 26729a4

Browse files
authored
add 202502W2 (#119)
* Update Eisvogel to Version 3.2.0 * review 1 * tip 1 * review 2 * share
1 parent a7166d6 commit 26729a4

23 files changed

+882
-43
lines changed

code/eisvogel.latex

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ $if(CJKmainfont)$
4747
\PassOptionsToPackage{space}{xeCJK}
4848
$endif$
4949
\documentclass[
50+
$for(babel-otherlangs)$
51+
$babel-otherlangs$,
52+
$endfor$
53+
$if(babel-lang)$
54+
$babel-lang$,
55+
$endif$
5056
$if(fontsize)$
5157
$fontsize$,
5258
$endif$
@@ -127,36 +133,36 @@ $endif$
127133
\ifPDFTeX\else
128134
% xetex/luatex font selection
129135
$if(mainfont)$
130-
$if(mainfontfallback)$
131-
\ifLuaTeX
132-
\usepackage{luaotfload}
133-
\directlua{luaotfload.add_fallback("mainfontfallback",{
134-
$for(mainfontfallback)$"$mainfontfallback$"$sep$,$endfor$
135-
})}
136-
\fi
137-
$endif$
136+
$if(mainfontfallback)$
137+
\ifLuaTeX
138+
\usepackage{luaotfload}
139+
\directlua{luaotfload.add_fallback("mainfontfallback",{
140+
$for(mainfontfallback)$"$mainfontfallback$"$sep$,$endfor$
141+
})}
142+
\fi
143+
$endif$
138144
\setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$$if(mainfontfallback)$,RawFeature={fallback=mainfontfallback}$endif$]{$mainfont$}
139145
$endif$
140146
$if(sansfont)$
141-
$if(sansfontfallback)$
142-
\ifLuaTeX
143-
\usepackage{luaotfload}
144-
\directlua{luaotfload.add_fallback("sansfontfallback",{
145-
$for(sansfontfallback)$"$sansfontfallback$"$sep$,$endfor$
146-
})}
147-
\fi
148-
$endif$
147+
$if(sansfontfallback)$
148+
\ifLuaTeX
149+
\usepackage{luaotfload}
150+
\directlua{luaotfload.add_fallback("sansfontfallback",{
151+
$for(sansfontfallback)$"$sansfontfallback$"$sep$,$endfor$
152+
})}
153+
\fi
154+
$endif$
149155
\setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$$if(sansfontfallback)$,RawFeature={fallback=sansfontfallback}$endif$]{$sansfont$}
150156
$endif$
151157
$if(monofont)$
152-
$if(monofontfallback)$
153-
\ifLuaTeX
154-
\usepackage{luaotfload}
155-
\directlua{luaotfload.add_fallback("monofontfallback",{
156-
$for(monofontfallback)$"$monofontfallback$"$sep$,$endfor$
157-
})}
158-
\fi
159-
$endif$
158+
$if(monofontfallback)$
159+
\ifLuaTeX
160+
\usepackage{luaotfload}
161+
\directlua{luaotfload.add_fallback("monofontfallback",{
162+
$for(monofontfallback)$"$monofontfallback$"$sep$,$endfor$
163+
})}
164+
\fi
165+
$endif$
160166
\setmonofont[$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$if(monofontfallback)$,RawFeature={fallback=monofontfallback}$endif$]{$monofont$}
161167
$endif$
162168
$for(fontfamilies)$
@@ -177,12 +183,12 @@ $if(CJKmainfont)$
177183
\ifXeTeX
178184
\usepackage{xeCJK}
179185
\setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$}
180-
$if(CJKsansfont)$
181-
\setCJKsansfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKsansfont$}
182-
$endif$
183-
$if(CJKmonofont)$
184-
\setCJKmonofont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmonofont$}
185-
$endif$
186+
$if(CJKsansfont)$
187+
\setCJKsansfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKsansfont$}
188+
$endif$
189+
$if(CJKmonofont)$
190+
\setCJKmonofont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmonofont$}
191+
$endif$
186192
\fi
187193
$endif$
188194
$if(luatexjapresetoptions)$
@@ -432,34 +438,25 @@ $-- Babel language support
432438
$--
433439
$if(lang)$
434440
\ifLuaTeX
435-
\usepackage[bidi=basic]{babel}
441+
\usepackage[bidi=basic,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
436442
\else
437-
\usepackage[bidi=default]{babel}
443+
\usepackage[bidi=default,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
438444
\fi
439445
$if(babel-lang)$
440-
\babelprovide[main,import]{$babel-lang$}
441446
$if(mainfont)$
442447
\ifPDFTeX
443448
\else
444449
\babelfont{rm}[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$$if(mainfontfallback)$,RawFeature={fallback=mainfontfallback}$endif$]{$mainfont$}
445450
\fi
446451
$endif$
447452
$endif$
448-
$for(babel-otherlangs)$
449-
\babelprovide[import]{$babel-otherlangs$}
450-
$endfor$
451453
$for(babelfonts/pairs)$
452454
\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
453455
$endfor$
454-
% get rid of language-specific shorthands (see #6817):
455-
\let\LanguageShortHands\languageshorthands
456-
\def\languageshorthands#1{}
457-
$if(selnolig-langs)$
458456
\ifLuaTeX
459-
\usepackage[$for(selnolig-langs)$$it$$sep$,$endfor$]{selnolig} % disable illegal ligatures
457+
\usepackage{selnolig} % disable illegal ligatures
460458
\fi
461459
$endif$
462-
$endif$
463460
$--
464461
$-- pagestyle
465462
$--
@@ -510,7 +507,7 @@ $--
510507
$-- csquotes
511508
$--
512509
$if(csquotes)$
513-
\usepackage{csquotes}
510+
\usepackage[$for(csquotesoptions)$$csquotesoptions$$sep$,$endfor$]{csquotes}
514511
$endif$
515512
$for(header-includes)$
516513
$header-includes$
@@ -880,6 +877,15 @@ contents={%
880877
$endif$
881878
$endif$
882879

880+
%
881+
% Define watermark
882+
%
883+
$if(watermark)$
884+
\usepackage{draftwatermark}
885+
\SetWatermarkText{$watermark$}
886+
\SetWatermarkScale{.5}
887+
$endif$
888+
883889
\begin{document}
884890

885891
$if(titlepage)$
198 KB
Loading

images/2025/02/640.jpeg

92 KB
Loading

images/2025/02/641.png

230 KB
Loading

images/2025/02/642.jpeg

152 KB
Loading

images/2025/02/643.jpeg

27 KB
Loading

images/2025/02/644.jpeg

41.4 KB
Loading

images/2025/02/645.png

24.5 KB
Loading

images/2025/02/646.png

42.9 KB
Loading

images/2025/02/647.png

30 KB
Loading

0 commit comments

Comments
 (0)