Skip to content

Commit 49d154c

Browse files
committed
Use babel options shorthands=off.
This has been fixed now in Babel for some time. So we can now get rid of the ugly code that disabled language-specific shorthands (see e26d31d). Closes #6817.
1 parent 4948d27 commit 49d154c

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

data/templates/common.latex

+2-5
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ $-- Babel language support
183183
$--
184184
$if(lang)$
185185
\ifLuaTeX
186-
\usepackage[bidi=basic$for(babeloptions)$,$babeloptions$$endfor$]{babel}
186+
\usepackage[bidi=basic,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
187187
\else
188-
\usepackage[bidi=default$for(babeloptions)$,$babeloptions$$endfor$]{babel}
188+
\usepackage[bidi=default,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
189189
\fi
190190
$if(babel-lang)$
191191
$if(mainfont)$
@@ -198,9 +198,6 @@ $endif$
198198
$for(babelfonts/pairs)$
199199
\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
200200
$endfor$
201-
% get rid of language-specific shorthands (see #6817):
202-
\let\LanguageShortHands\languageshorthands
203-
\def\languageshorthands#1{}
204201
\ifLuaTeX
205202
\usepackage{selnolig} % disable illegal ligatures
206203
\fi

test/command/9472.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,10 @@ More text in English. ['Zitat auf Deutsch.']{lang=de}
4949
\KOMAoptions{parskip=half}}
5050
\makeatother
5151
\ifLuaTeX
52-
\usepackage[bidi=basic]{babel}
52+
\usepackage[bidi=basic,shorthands=off,]{babel}
5353
\else
54-
\usepackage[bidi=default]{babel}
54+
\usepackage[bidi=default,shorthands=off,]{babel}
5555
\fi
56-
% get rid of language-specific shorthands (see #6817):
57-
\let\LanguageShortHands\languageshorthands
58-
\def\languageshorthands#1{}
5956
\ifLuaTeX
6057
\usepackage{selnolig} % disable illegal ligatures
6158
\fi

test/writers-lang-and-dir.latex

+2-5
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,10 @@
4343
\KOMAoptions{parskip=half}}
4444
\makeatother
4545
\ifLuaTeX
46-
\usepackage[bidi=basic]{babel}
46+
\usepackage[bidi=basic,shorthands=off,]{babel}
4747
\else
48-
\usepackage[bidi=default]{babel}
48+
\usepackage[bidi=default,shorthands=off,]{babel}
4949
\fi
50-
% get rid of language-specific shorthands (see #6817):
51-
\let\LanguageShortHands\languageshorthands
52-
\def\languageshorthands#1{}
5350
\ifLuaTeX
5451
\usepackage{selnolig} % disable illegal ligatures
5552
\fi

0 commit comments

Comments
 (0)