selnolig (8aug13)

git-svn-id: svn://tug.org/texlive/trunk@31390 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 48 insertions, 26 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 a2bff825fce..589d48e0361 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/30]
+[2013/08/08]
 
 % This entire package is placed under the
 % terms of the LaTeX Project Public License,
@@ -14,9 +14,11 @@
 % (loretan dot mico at gmail dot com)
 
 
-\hyphenation{re-roof re-roof-ing be-dwarf
-   be-dwarf-ing be-gulf be-gulf-ing feoff en-feoff in-feoff re-staff re-stuff
-   dam-sel dam-sel-fish dam-sel-fly dam-sel-flies dis-tel-fink but-ter-fin-ger
+\hyphenation{re-roof re-roof-ing 
+   be-dwarf be-dwarf-ing be-gulf be-gulf-ing feoff en-feoff in-feoff 
+   re-staff re-stuff
+   dam-sel dam-sel-fish dam-sel-fly dam-sel-flies 
+   dis-tel-fink but-ter-fin-ger
    man-tel-shelf man-tel-shelf-ful man-tel-shelf-fuls
    dwarf-ish elf-ish oaf-ish serf-ish un-self-ish wolf-ish draff-ish 
    gi-raff-ish raff-ish
@@ -49,7 +51,8 @@
    chaf-finch chaf-finches wolf-fish
    fif-ties fif-ti-eth fif-ti-eths fif-ty-ish
    half-tone half-tones roof-top roof-tops
-   bat-house boat-house cat-house proph-et-hood rat-hole boat-hook meat-hook pot-hook
+   bat-house boat-house cat-house proph-et-hood rat-hole 
+   boat-hook meat-hook pot-hook
    foot-hold root-hold ant-hill foot-hill goat-herd neat-herd
    boat-houses cat-houses rat-holes boat-hooks meat-hooks pot-hooks
    foot-holds root-holds ant-hills foot-hills goat-herds neat-herds
@@ -146,6 +149,7 @@
    re-tiled re-tiles re-til-ing
    ret-ina ret-i-nae ret-i-nas ret-i-nal ret-i-nal
    ret-ina-cula ret-ina-cu-lum ret-i-form
+   cats-kills peeks-kill 
 }
 
 \ifnum\righthyphenmin=2
@@ -177,7 +181,8 @@
    pleth-o-ra meth-od 
    greens-keep-er grounds-keep-er for-tune-tell-er
    in-tra-tho-rac-ic aro-ma-ther-a-py 
-   ar-che-typ-al free-think-er}
+   ar-che-typ-al free-think-er
+    in-fra-spe-cif-ic in-tra-spe-cif-ic}
 \else
    \hyphenation{beef-ier comf-ier goof-ier gulf-ier leaf-ier surf-ier 
    turf-ier
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 11b29684376..3246ddd182e 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/30]
+[2013/08/08]
 
 % This entire package is placed under the
 % terms of the LaTeX Project Public License,
@@ -432,6 +432,11 @@
   % aesthetic esthetic unesthetic
   % prosthetist 
 
+\nolig{Charlest}{Charles|t}
+  % Charleston 
+\nolig{Reston}{Res|ton}
+  % Reston (Washington DC suburb)
+
 \nolig{stown}{s|town}
   % crosstown Williamstown
 
@@ -484,9 +489,10 @@
 \nolig{Misp}{Mis|p}
   % misplace misperception misprint
 
-\nolig{susp}{sus|p}
-\nolig{Susp}{Sus|p}
-  % suspend suspension suspicious
+\nolig{suspen}{sus|pen}
+\nolig{Suspen}{Sus|pen}
+  % suspend suspension 
+
 \nolig{sph}{s|ph} % 'ph' from Greek 'phi'!
   % atmosphere biosphere hemisphere
   % spherical asphodel phosphorous phosphate
@@ -518,6 +524,10 @@
   % newsprint
   % Don't suppress sp lig in "newspeak"!
 
+\nolig{Hyannisp}{Hyannis|p}
+  % Hyannisport
+\nolig{Keyespo}{Keyes|po}
+  % Keyesport
 \nolig{Williamsp}{Williams|p}
   % Williamsport
 
@@ -1030,6 +1040,12 @@
 \nolig{Ausp}{Au|sp}
   % auspicious inauspicious 
 
+\nolig{Suspect}{Su|spect}
+\nolig{suspect}{su|spect}
+  % suspect suspects
+\nolig{uspici}{u|spici}
+  % suspicion suspicious
+
 % (iii) at and et preceding th
 % ............................
 
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 b6a391b285d..3df9291a1c3 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/30]
+[2013/08/08]
 
 % 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 66bcd985411..f12cd120a8c 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/30]
+[2013/08/08]
 
 % This entire package is placed under the
 % terms of the LaTeX Project Public License,
@@ -1021,9 +1021,9 @@
   % Schenkelklopflektüre
 \nolig{fler}{f|ler}
   % Freiberufler Löffler Büffler Schnüffler Höfler
-  \keeplig{Hoefler} % name of a famous font designer
+  \keeplig{Hoefler} % a famous font designer!
 \nolig{fleut}{f|leut}
-  % Hofleute
+  % Hofleute Kaufleute
 
 \nolig{flich}{f|lich}
   % tariflich reiflich glimpflich ...
@@ -1129,8 +1129,7 @@
   \keeplig{iopflast}  % Biopflaster
   \keeplig{nopflaster}% Kinopflaster
   \keeplig{opflair}   % Popflair
-  \keeplig{opflanz}   
-    % Kakaopflanzen Indigopflanzen
+  \keeplig{opflanz}   % Kakaopflanzen
 \nolig{öpfle}{öpf|le}
   % köpfle tröpfle Knöpfle
 \nolig{orflad}{orf|lad}
@@ -1889,6 +1888,7 @@
 \nolig{fb}{f|b}
 \nolig{fh}{f|h}
 \nolig{fk}{f|k}
+
   % However, there are names of *non-German* 
   % origin for which the 'fk' ligature 
   % shouldn't be suppressed:
diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua
index 8a9b34b765c..6b2931190f0 100644
--- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua
+++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua
@@ -1,10 +1,10 @@
--- Lua code for the selnolig package, to be loaded
--- with an instruction such as 
+-- Lua code for the selnolig package.
+-- To be loaded with an instruction such as 
 --    \directlua{  require("selnolig.lua")  }
 -- from a (Lua)LaTeX .sty file.
 --
 -- Author: Mico Loretan (loretan dot mico at gmail dot com)
---    (with crucial contributions by Taco Hoekwater, 
+--    (with crucial contributions from Taco Hoekwater, 
 --    Patrick Gundlach, and Steffen Hildebrandt)
 --
 -- The entire selnolig package is placed under the terms 
@@ -15,14 +15,16 @@
 selnolig = { }
 selnolig.module = {
    name         = "selnolig",
-   version      = "0.250",
-   date         = "2013/06/30",
+   version      = "0.254",
+   date         = "2013/08/08",
    description  = "Selective suppression of typographic ligatures",
    author       = "Mico Loretan",
    copyright    = "Mico Loretan",
    license      = "LPPL 1.3 or later"
 }
 
+debug=false -- default: don't output detailed information
+
 -- Define variables corresponding to various text nodes;
 -- cf. sections 8.1.2 and 8.1.4 of LuaTeX reference guide
 local rule    = node.id('rule')
@@ -40,7 +42,6 @@ end
 local identifier = 123456  -- any unique identifier
 local noliga={}
 local keepliga={}          -- String -> Boolean
-debug=true
 
 function debug_info(s)
   if debug then
@@ -183,7 +184,7 @@ end
 function enable_suppression(val)
   suppression_on = val
   if val then
-    debug_info("Turning ligature suppression on")
+    debug_info("Turning ligature suppression back on")
   else
     debug_info("Turning ligature suppression off")
   end
diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty
index a2f84a0262e..6ced0b0d924 100644
--- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty
+++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty
@@ -13,15 +13,15 @@
 % ---------------------
 
 \def\selnoligpackagename{selnolig}
-\def\selnoligpackageversion{0.250}
-\def\selnoligpackagedate{2013/06/30}
+\def\selnoligpackageversion{0.254}
+\def\selnoligpackagedate{2013/08/08}
 
 % Announce who we are. Issue warning message if we're
 % not running under LuaLaTeX.
 
 \typeout{=== Package \selnoligpackagename, 
              Version \selnoligpackageversion, 
-             Date    \selnoligpackagedate ===}
+             Date    \selnoligpackagedate\space ===}
 \ProvidesPackage{selnolig}[\selnoligpackagedate]
 
 \RequirePackage{ifluatex}