Skip to content

Commit

Permalink
Use babel options shorthands=off.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jgm committed Feb 10, 2025
1 parent 4948d27 commit 49d154c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
7 changes: 2 additions & 5 deletions data/templates/common.latex
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ $-- Babel language support
$--
$if(lang)$
\ifLuaTeX
\usepackage[bidi=basic$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=basic,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\else
\usepackage[bidi=default$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\usepackage[bidi=default,shorthands=off,$for(babeloptions)$,$babeloptions$$endfor$]{babel}
\fi
$if(babel-lang)$
$if(mainfont)$
Expand All @@ -198,9 +198,6 @@ $endif$
$for(babelfonts/pairs)$
\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$}
$endfor$
% get rid of language-specific shorthands (see #6817):
\let\LanguageShortHands\languageshorthands
\def\languageshorthands#1{}
\ifLuaTeX
\usepackage{selnolig} % disable illegal ligatures
\fi
Expand Down
7 changes: 2 additions & 5 deletions test/command/9472.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,10 @@ More text in English. ['Zitat auf Deutsch.']{lang=de}
\KOMAoptions{parskip=half}}
\makeatother
\ifLuaTeX
\usepackage[bidi=basic]{babel}
\usepackage[bidi=basic,shorthands=off,]{babel}
\else
\usepackage[bidi=default]{babel}
\usepackage[bidi=default,shorthands=off,]{babel}
\fi
% get rid of language-specific shorthands (see #6817):
\let\LanguageShortHands\languageshorthands
\def\languageshorthands#1{}
\ifLuaTeX
\usepackage{selnolig} % disable illegal ligatures
\fi
Expand Down
7 changes: 2 additions & 5 deletions test/writers-lang-and-dir.latex
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,10 @@
\KOMAoptions{parskip=half}}
\makeatother
\ifLuaTeX
\usepackage[bidi=basic]{babel}
\usepackage[bidi=basic,shorthands=off,]{babel}
\else
\usepackage[bidi=default]{babel}
\usepackage[bidi=default,shorthands=off,]{babel}
\fi
% get rid of language-specific shorthands (see #6817):
\let\LanguageShortHands\languageshorthands
\def\languageshorthands#1{}
\ifLuaTeX
\usepackage{selnolig} % disable illegal ligatures
\fi
Expand Down

0 comments on commit 49d154c

Please sign in to comment.