diff options
Diffstat (limited to 'Master/texmf-dist/tex/lualatex')
6 files changed, 13 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-hyphex.sty b/Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-hyphex.sty index 238114658b0..92a1f504c1a 100644 --- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-hyphex.sty +++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-hyphex.sty @@ -2,7 +2,7 @@ % !TEX TS-program = lualatex \ProvidesPackage{selnolig-english-hyphex}% -[2015/10/08] +[2015/10/26] % This entire package is placed under the % terms of the LaTeX Project Public License, diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-patterns.sty b/Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-patterns.sty index 480888ba7dd..a5d0c5a756a 100644 --- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-patterns.sty +++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-patterns.sty @@ -2,7 +2,7 @@ % !TEX TS-program = lualatex \ProvidesPackage{selnolig-english-patterns}% -[2015/10/08] +[2015/10/26] % This entire package is placed under the % terms of the LaTeX Project Public License, @@ -91,8 +91,9 @@ % (h) ft -> f-t -\if@noftligs -\else % suppress these ligatures selectively... +\if@noftligs % suppress ft ligatures globally + \nolig{ft}{f|t} +\else % suppress ft ligatures selectively... \nolig{ieftain}{ief|tain} \nolig{alftime}{alf|time} \nolig{alftone}{alf|tone} diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-hyphex.sty b/Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-hyphex.sty index 5f3bf984691..03560441b6c 100644 --- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-hyphex.sty +++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-hyphex.sty @@ -3,7 +3,7 @@ \RequirePackage{ifluatex} % provides \ifluatex macro \ProvidesPackage{selnolig-german-hyphex}% -[2015/10/08] +[2015/10/26] % This entire package is placed under the % terms of the LaTeX Project Public License, diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-patterns.sty b/Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-patterns.sty index d1f195e6849..6d878a50e9b 100644 --- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-patterns.sty +++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-patterns.sty @@ -2,7 +2,7 @@ % !TEX TS-program = lualatex \ProvidesPackage{selnolig-german-patterns}% -[2015/10/08] +[2015/10/26] % This entire package is placed under the % terms of the LaTeX Project Public License, @@ -1111,7 +1111,7 @@ \nolig{flohn}{f|lohn} % Tariflohn Tieflohnland \keeplig{flohnetz} % Wasserflohnetz - \keeplig{ntflohn} % entflohn (Faust I) + \keeplig{ntflohn} % entflohn (Faust I [!]) \nolig{flöhn}{f|löhn} % Tariflöhne \nolig{flok}{f|lok} @@ -1473,8 +1473,8 @@ % ------------ \if@noftligs - %% "ft" ligatures are suppressed globally -\else % suppress them selectively... + \nolig{ft}{f|t} % "ft"-Ligatur global unterdrücken +\else % "ft"-Ligatur selektiv unterdrücken \nolig{Auft[aähioöruüy]}{Auf|t} \nolig{auft[aähioöruüy]}{auf|t} % (viele viele Fälle) diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua index cf4f092671d..7bf40d135e3 100644 --- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua +++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua @@ -16,7 +16,7 @@ selnolig = { } selnolig.module = { name = "selnolig", version = "0.256", - date = "2015/10/08", + date = "2015/10/26", description = "Selective suppression of typographic ligatures", author = "Mico Loretan", copyright = "Mico Loretan", diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty index db663e44b79..a31b9ebd88a 100644 --- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty +++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty @@ -13,8 +13,8 @@ % --------------------- \def\selnoligpackagename{selnolig} -\def\selnoligpackageversion{0.301} -\def\selnoligpackagedate{2015/10/08} +\def\selnoligpackageversion{0.302} +\def\selnoligpackagedate{2015/10/26} % Announce who we are. @@ -151,11 +151,6 @@ \ProcessOptions\relax -\if@noftligs{% % suppress ft and fft ligatures globally - \AtBeginDocument{ \nolig{ft}{f|t} } -\fi - - % Part 2: Load the lua code and set up the user macros % ---------------------------------------------------- |