From 4197e92d39c374b0fb7e425517db8f5e70640e48 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Oct 2015 22:55:17 +0000 Subject: selnolig (26oct15) git-svn-id: svn://tug.org/texlive/trunk@38721 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/lualatex/selnolig/gpp-ft.fea | 23 +++++++++++++++++++++ .../doc/lualatex/selnolig/selnolig-bugreport.tex | 2 +- .../lualatex/selnolig/selnolig-english-test.pdf | Bin 81936 -> 81746 bytes .../lualatex/selnolig/selnolig-english-test.tex | 2 +- .../selnolig/selnolig-english-wordlist.tex | 2 +- .../doc/lualatex/selnolig/selnolig-german-test.pdf | Bin 32236 -> 32239 bytes .../doc/lualatex/selnolig/selnolig-german-test.tex | 2 +- .../lualatex/selnolig/selnolig-german-wordlist.tex | 2 +- .../texmf-dist/doc/lualatex/selnolig/selnolig.pdf | Bin 361693 -> 358610 bytes .../texmf-dist/doc/lualatex/selnolig/selnolig.tex | 10 ++++++--- .../lualatex/selnolig/selnolig-english-hyphex.sty | 2 +- .../selnolig/selnolig-english-patterns.sty | 7 ++++--- .../lualatex/selnolig/selnolig-german-hyphex.sty | 2 +- .../lualatex/selnolig/selnolig-german-patterns.sty | 8 +++---- .../texmf-dist/tex/lualatex/selnolig/selnolig.lua | 2 +- .../texmf-dist/tex/lualatex/selnolig/selnolig.sty | 9 ++------ 16 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 Master/texmf-dist/doc/lualatex/selnolig/gpp-ft.fea (limited to 'Master') diff --git a/Master/texmf-dist/doc/lualatex/selnolig/gpp-ft.fea b/Master/texmf-dist/doc/lualatex/selnolig/gpp-ft.fea new file mode 100644 index 00000000000..d7422ed83cd --- /dev/null +++ b/Master/texmf-dist/doc/lualatex/selnolig/gpp-ft.fea @@ -0,0 +1,23 @@ +# OpenType feature file to suppress the "rare" f_t.alt +# ligature provided by the font "Garamond Premier Pro". +# This feature file is employed by selnolig.tex, the +# user guide for the 'selnolig' package. +# Created by Mico Loretan, January 2013, based on +# important (crucial!) help provided by Khaled Hosny +# (see http://tex.stackexchange.com/q/89963/5001). + +# Scripts and languages +# If the font uses others, they should be defined here too +languagesystem DFLT dflt; +languagesystem latn dflt; + +# Undo the "f_t.alt" discretionary ligature +feature dlig { + sub f_t.alt by f t; +} dlig; + +# Apply the regular ligatures for ft and fft +feature liga { + sub f f t by f_f_t; + sub f t by f_t; +} liga; \ No newline at end of file diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-bugreport.tex b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-bugreport.tex index 4ddd2c8ba50..328c608dc76 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-bugreport.tex +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-bugreport.tex @@ -1,5 +1,5 @@ % !TEX TS-program = lualatex -% selnolig-bugreport.tex, 2015/10/08 +% selnolig-bugreport.tex, 2015/10/26 \documentclass{article} \usepackage[margin=1in]{geometry} diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.pdf b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.pdf index 49710b249dd..60f4a448cf5 100644 Binary files a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.pdf and b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.tex b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.tex index 3d84ff9d254..0dec5a98b5d 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.tex +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.tex @@ -8,7 +8,7 @@ % in the companion file 'selnolig-english-wordlist.tex'. % % Author: Mico Loretan (loretan dot mico at gmail dot com) -% Date: 2015/10/08 +% Date: 2015/10/26 % Check first that we're running Lua(La)TeX. \usepackage{ifluatex} diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-wordlist.tex b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-wordlist.tex index e0909ea18b1..616d5d0d7e0 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-wordlist.tex +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-wordlist.tex @@ -1,7 +1,7 @@ % !TeX root = selnolig-english-test.tex % !TEX TS-program = lualatex -% Last updated: 2015/10/08 +% Last updated: 2015/10/26 % For use with the 'selnolig' package and the % driver program 'selnolig-english-test.tex'. diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.pdf b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.pdf index 2de939c6c3f..b973e1e9071 100644 Binary files a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.pdf and b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.tex b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.tex index c58eca3cdd2..d84e2d354a4 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.tex +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.tex @@ -7,7 +7,7 @@ % of test words is in 'selnolig-german-wordlist.tex'. % % Author: Mico Loretan (loretan dot mico at gmail dot com) -% Date: 2015/10/08 +% Date: 2015/10/26 % Check first that we're running lua(la)tex. \usepackage{ifluatex} diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-wordlist.tex b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-wordlist.tex index 1e6eeaf26be..a2df2dbb5d1 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-wordlist.tex +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-wordlist.tex @@ -1,7 +1,7 @@ % !TeX root = selnolig-german-test.tex % !TEX TS-program = lualatex -% Last updated: 2015/10/08 +% Last updated: 2015/10/26 % For use with the 'selnolig' package and the % driver program 'selnolig-german-test.tex'. diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig.pdf b/Master/texmf-dist/doc/lualatex/selnolig/selnolig.pdf index 6eab0350d8f..0399b46a737 100644 Binary files a/Master/texmf-dist/doc/lualatex/selnolig/selnolig.pdf and b/Master/texmf-dist/doc/lualatex/selnolig/selnolig.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig.tex b/Master/texmf-dist/doc/lualatex/selnolig/selnolig.tex index 77c263bc4c6..a639c8840ee 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig.tex +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig.tex @@ -10,7 +10,7 @@ % It has the status "maintained". % % Author: Mico Loretan (loretan dot mico at gmail dot com) -% Date: 2015/10/08 +% Date: 2015/10/26 % The file selnolig.tex contains the user guide to the % selnolig package. @@ -97,7 +97,7 @@ \nolig{steiflehnig}{s|teiflehnig} \nolig{strafbar}{s|trafbar} \nolig{belustigt}{belus|tigt} -\nolig{höflichst}{höflichs|t} +\nolig{flichst}{flichs|t} % flichst, höflichst \nolig{trittst}{tritts|t} \nolig{vortrefflichsten}{vortrefflichs|ten} \nolig{schnellste}{schnells|te} @@ -122,6 +122,8 @@ auf-füh-ren auf-hor-chen-den her-auf-kom-men un-er-schöpf-lich un-be-greif-lich kauf-leu-ten schlaf-lo-sig-keit ver-werf-li-che} + +\debugon % Load still a few more packages... @@ -586,7 +588,9 @@ However, the scope of this \cmmd{nolig} rule is a bit too broad (or, if you will \begin{Verbatim} \keeplig{flicht} \end{Verbatim} -This rule tells \pkg{selnolig} to override the action of the \Verb+\nolig{flich}{f|lich}+ rule for all words that contain the string \opt{flicht}. Most words affected by this \cmmd{keeplig} rule happen to contain the strings \enquote{Pflicht} and \enquote{pflicht}. In addition, this rule also helps preserve the fl-ligature in words such as \enquote{flichst} and \enquote{verflicht} (the second- and third-person-singular forms of the verbs flechten and verflechten, respectively). +This rule tells \pkg{selnolig} to override the action of the \Verb+\nolig{flich}{f|lich}+ rule for all words that contain the string \opt{flicht}. Most words affected by this \cmmd{keeplig} rule happen to contain the strings \enquote{Pflicht} and \enquote{pflicht}. In addition, this rule also helps preserve the fl-ligature in words such as \enquote{entflicht} and \enquote{verflicht} (the third-person-singular forms of the verbs entflechten and verflechten, respectively). + +%%%%flichst verflichst entflichst It is important to be aware of the following fact: It is \emph{not necessarily} the case that ligatures contained in the argument of a \cmmd{keeplig} rule will be used in words that contain the rule's search string. Why?! It is because, as was noted above, \emph{more than one} \cmmd{nolig} rule can apply to a given word. Consider, for instance, the word \opt{Lauflicht} mentioned earlier. This word happens to be caught by two \cmmd{nolig} rules and one \cmmd{keeplig} rule provided in the file \pkg{selnolig-german-patterns.sty}: \begin{Verbatim} 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 % ---------------------------------------------------- -- cgit v1.2.3