summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-05 19:06:49 +0000
committerKarl Berry <karl@freefriends.org>2013-07-05 19:06:49 +0000
commitd8a89cd2da7cf3b8bb2925b7bef0ea98443cdda5 (patch)
tree916d8951849b97f45895dde5ba7314ed1d91d9c3 /Master/texmf-dist/tex
parentc2719fb94b09699c39eda729b2baec0b4f8002a0 (diff)
selnolig (4jul13)
git-svn-id: svn://tug.org/texlive/trunk@31102 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-hyphex.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/selnolig/selnolig-english-patterns.sty25
-rw-r--r--Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-hyphex.sty3
-rw-r--r--Master/texmf-dist/tex/lualatex/selnolig/selnolig-german-patterns.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua4
-rw-r--r--Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty4
6 files changed, 15 insertions, 25 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 538c0a6d70b..a2bff825fce 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}%
-[2013/06/12]
+[2013/06/30]
% 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 04a1be2b37c..11b29684376 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}%
-[2013/06/12]
+[2013/06/30]
% This entire package is placed under the
% terms of the LaTeX Project Public License,
@@ -22,11 +22,9 @@
\nolig{lfful}{lf|ful}
% shelfful bookshelffuls -- TeXBook, p. 19
-
% (b) fi -> f-i
% no cases in 'basic' group
-
% (c) fl -> f-l
\nolig{fless}{f|less}
@@ -58,7 +56,6 @@
\nolig{otfload}{otf|load}
% for the 'luaotfload' package...
-
% (d) ffi -> ff-i
\nolig{faffian}{faff|ian}
@@ -68,7 +65,6 @@
\nolig{lffian}{lff|ian}
% Wolffian Wulffian
-
% (e) ffl -> ff-l
\nolig{fflaw}{ff|law}
@@ -80,7 +76,6 @@
\nolig{ffload}{ff|load}
% offload offloads offloaded
-
% (f) ffi -> f-fi
\nolig{haffinch}{haf|finch}
@@ -89,13 +84,11 @@
\nolig{lffish}{lf|fish}
% wolffish
-
% (g) ffl -> f-fl
\nolig{afflower}{af|flower}
% safflower
-
% (h) ft -> f-t
\if@noftligs
@@ -123,7 +116,6 @@
% offtrack
\fi % end of \if@noftligs conditional block
-
% (i) fb, fh, fj, and fk ligatures
% suppress these ligatures globally
@@ -168,14 +160,12 @@
% (a) ff -> f-f
% no cases in 'broad' group
-
% (b) fi -> f-i
\nolig{elfin}{elf|in}
\nolig{Elfin}{Elf|in}
\keeplig{stelfink} % distelfink
-
% For words ending in -f-ing, allow for
% "colloquial" abbreviations (-f-in').
\nolig{afing}{af|ing}
@@ -270,7 +260,6 @@
% (Mustn't do 'finess -> f-iness'
% substitution b/c of 'finesse')
-
% (c) fl -> f-l
\nolig{aloofly}{aloof|ly}
@@ -287,7 +276,6 @@
% (Mustn't perform 'fly -> f-ly' subst.
% b/c of 'fly' 'butterfly' ...)
-
% (d) ffi -> ff-i
\nolig{affish}{aff|ish}
@@ -313,21 +301,17 @@
% baffies biffies jiffies stuffies ...
% buffiest chaffiest ...
-
% (e) ffl -> ff-l
\nolig{ffly}{ff|ly}
% bluffly gruffly ruffly ...
-
% (f) ffi -> f-fi
% nothing additional in 'broad' group
-
% (g) ffl -> f-fl
% nothing additional in 'broad' group
-
% (h) ft -> f-t
\if@noftligs
@@ -348,7 +332,6 @@
-
% Part 3: Discretionary ligatures crossing
% morpheme boundaries
% st, ct, sp,
@@ -449,6 +432,9 @@
% aesthetic esthetic unesthetic
% prosthetist
+\nolig{stown}{s|town}
+ % crosstown Williamstown
+
% (B) ct -> c-t
% -------------
@@ -532,6 +518,9 @@
% newsprint
% Don't suppress sp lig in "newspeak"!
+\nolig{Williamsp}{Williams|p}
+ % Williamsport
+
% (D) th -> t-h
% -------------
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 e2bfc6d6b5a..b6a391b285d 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}
\ProvidesPackage{selnolig-german-hyphex}%
-[2013/06/12]
+[2013/06/30]
% This entire package is placed under the
% terms of the LaTeX Project Public License,
@@ -54,6 +54,7 @@ blau-flau-schig blau-flau-schi-ge blau-flau-schi-gen
blau-fle-ckig blau-fle-cki-ge blau-fle-ckig-keit
blau-topf-lo-go bluff-leck brei-flo-cken
brenn-stoff-ta-ges-tank
+brief-in-tri-ge brief-in-tri-gen
brunft-schauf-ler
brust-bein-hälf-te brust-bein-hälf-ten
burg-graf-tum
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 9f29adf1fe5..66bcd985411 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}%
-[2013/06/12]
+[2013/06/30]
% This entire package is placed under the
% terms of the LaTeX Project Public License,
diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua
index f155b119020..8a9b34b765c 100644
--- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua
+++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua
@@ -15,8 +15,8 @@
selnolig = { }
selnolig.module = {
name = "selnolig",
- version = "0.221",
- date = "2013/06/12",
+ version = "0.250",
+ date = "2013/06/30",
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 a2a6045443c..a2f84a0262e 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.221a}
-\def\selnoligpackagedate{2013/06/12}
+\def\selnoligpackageversion{0.250}
+\def\selnoligpackagedate{2013/06/30}
% Announce who we are. Issue warning message if we're
% not running under LuaLaTeX.