Skip to content

Commit 4948d27

Browse files
committed
Remove selnolig-langs.
We now specify the language as a global option again, so we no longer need to specify it when invoking selnolig. See #9863.
1 parent 786356a commit 4948d27

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

data/templates/common.latex

+1-3
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,10 @@ $endfor$
201201
% get rid of language-specific shorthands (see #6817):
202202
\let\LanguageShortHands\languageshorthands
203203
\def\languageshorthands#1{}
204-
$if(selnolig-langs)$
205204
\ifLuaTeX
206-
\usepackage[$for(selnolig-langs)$$it$$sep$,$endfor$]{selnolig} % disable illegal ligatures
205+
\usepackage{selnolig} % disable illegal ligatures
207206
\fi
208207
$endif$
209-
$endif$
210208
$--
211209
$-- pagestyle
212210
$--

src/Text/Pandoc/Writers/LaTeX.hs

+2-8
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@ import Control.Monad
3333
import Data.Containers.ListUtils (nubOrd)
3434
import Data.Char (isDigit)
3535
import Data.List (intersperse, (\\))
36-
import Data.Maybe (catMaybes, fromMaybe, isJust, mapMaybe, isNothing,
37-
maybeToList)
36+
import Data.Maybe (catMaybes, fromMaybe, isJust, mapMaybe, isNothing)
3837
import Data.Monoid (Any (..))
3938
import Data.Text (Text)
4039
import qualified Data.Text as T
4140
import Network.URI (unEscapeString)
4241
import Text.DocTemplates (FromContext(lookupContext), Val(..), renderTemplate)
43-
import Text.Collate.Lang (renderLang, Lang(langLanguage))
42+
import Text.Collate.Lang (renderLang)
4443
import Text.Pandoc.Class.PandocMonad (PandocMonad, report, toLang)
4544
import Text.Pandoc.Definition
4645
import Text.Pandoc.Highlighting (formatLaTeXBlock, formatLaTeXInline, highlight,
@@ -275,11 +274,6 @@ pandocToLaTeX options (Pandoc meta blocks) = do
275274
nubOrd . catMaybes .
276275
filter (/= babelLang)
277276
$ map toBabel docLangs))
278-
$ defField "selnolig-langs"
279-
(literal . T.intercalate "," $
280-
let langs = docLangs ++ maybeToList mblang
281-
in (["english" | any ((== "en") . langLanguage) langs] ++
282-
["german" | any ((== "de") . langLanguage) langs]))
283277
$ defField "latex-dir-rtl"
284278
((render Nothing <$> getField "dir" context) ==
285279
Just ("rtl" :: Text)) context

test/command/9472.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ More text in English. ['Zitat auf Deutsch.']{lang=de}
5757
\let\LanguageShortHands\languageshorthands
5858
\def\languageshorthands#1{}
5959
\ifLuaTeX
60-
\usepackage[german]{selnolig} % disable illegal ligatures
60+
\usepackage{selnolig} % disable illegal ligatures
6161
\fi
6262
\setlength{\emergencystretch}{3em} % prevent overfull lines
6363
\providecommand{\tightlist}{%

test/writers-lang-and-dir.latex

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
\let\LanguageShortHands\languageshorthands
5252
\def\languageshorthands#1{}
5353
\ifLuaTeX
54-
\usepackage[english,german]{selnolig} % disable illegal ligatures
54+
\usepackage{selnolig} % disable illegal ligatures
5555
\fi
5656
\setlength{\emergencystretch}{3em} % prevent overfull lines
5757
\providecommand{\tightlist}{%

0 commit comments

Comments
 (0)