selnolig (29aug13)

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

6 files changed, 183 insertions, 139 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 589d48e0361..c9dd0091df6 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/08/08]
+[2013/08/26]
 
 % This entire package is placed under the
 % terms of the LaTeX Project Public License,
@@ -149,7 +149,8 @@
    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 
+   cats-kills peeks-kill gott-hard det-ri-ment
+   che-tah
 }
 
 \ifnum\righthyphenmin=2
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 3246ddd182e..02bffa8d483 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/08/08]
+[2013/08/26]
 
 % This entire package is placed under the
 % terms of the LaTeX Project Public License,
@@ -164,7 +164,7 @@
 
 \nolig{elfin}{elf|in}
 \nolig{Elfin}{Elf|in}
-  \keeplig{stelfink} % distelfink
+  \keeplig{elfink} % distelfink
 
 % For words ending in -f-ing, allow for 
 % "colloquial" abbreviations (-f-in').
@@ -343,6 +343,8 @@
 % (A) st -> s-t
 % -------------
 
+\nolig{aspidistra}{a|spidi|stra}
+\nolig{Aspidistra}{Aspidi|stra}
 \nolig{osstalk}{oss|talk}
   % crosstalk
 \nolig{gstai}{gs|tai}
@@ -355,29 +357,31 @@
   % houndstooth
 \nolig{steeth}{s|teeth}
   % houndsteeth
+\nolig{astime}{as|time}
+  % pastime
 
 %%% dis-t... words
-\nolig{dista}{dis|ta}
-\nolig{Dista}{Dis|ta}
-  % distant distasteful 
+\nolig{distast}{dis|tast}
+\nolig{Distast}{Dis|tast}
+  % distasteful 
 \nolig{distem}{dis|tem}
 \nolig{Distem}{Dis|tem}
   % distemperate 
 \nolig{disten}{dis|ten}
 \nolig{Disten}{Dis|ten}
   % distended
-\nolig{distil}{dis|til}
-\nolig{Distil}{Dis|til}
-  % distil distillation 
-\nolig{distin}{dis|tin}
-\nolig{Distin}{Dis|tin}
-  % distinct distinguish
-\nolig{disto}{dis|to}
-\nolig{Disto}{Dis|to}
+\nolig{distor}{dis|tor}
+\nolig{Distor}{Dis|tor}
   % distort distortion 
-\nolig{distr}{dis|tr}
-\nolig{Distr}{Dis|tr}
-  % distract distribution distrust
+\nolig{distra[cu]}{dis|tra}
+\nolig{Distra[cu]}{Dis|tra}
+  % distract distraught
+\nolig{distrib}{dis|trib}
+\nolig{Distrib}{Dis|trib}
+  % distribution 
+\nolig{distrust}{dis|trust}
+\nolig{Distrust}{Dis|trust}
+  % distrust distrustful
 \nolig{distu}{dis|tu}
 \nolig{Distu}{Dis|tu}
   % disturb
@@ -410,6 +414,9 @@
 \nolig{mistran}{mis|tran}
 \nolig{Mistran}{Mis|tran}
   % Mistranscribe Mistranslate 
+\nolig{mistrain}{mis|train}
+\nolig{Mistrain}{Mis|train}
+  % mistrain
 \nolig{istrea}{is|trea}
   % mistreat mistreatment
 \nolig{mistru}{mis|tru}
@@ -432,10 +439,7 @@
   % aesthetic esthetic unesthetic
   % prosthetist 
 
-\nolig{Charlest}{Charles|t}
-  % Charleston 
-\nolig{Reston}{Res|ton}
-  % Reston (Washington DC suburb)
+\nolig{Esth}{Es|th} % Esther
 
 \nolig{stown}{s|town}
   % crosstown Williamstown
@@ -466,24 +470,52 @@
 \nolig{isplat}{is|plat}
   % cisplatin (cis-platin, not cisp-latin!)
 
-\nolig{desp}{des|p}
-\nolig{Desp}{Des|p}
-  % despair desperado despot desperate
-  \keeplig{despond} % despondency despondent
-  \keeplig{Despond}
-  \keeplig{despirit}
-  \keeplig{Despirit}
-  \keeplig{despoil}
-  \keeplig{Despoil}
-  \keeplig{sidesp} % sidespin, sidesplitting	
-  \keeplig{Sidesp}
-  \keeplig{widesp} % widespread
-  \keeplig{Widesp}
-  \keeplig{desprung} % gelandesprung
-
-\nolig{disp}{dis|p}
-\nolig{Disp}{Dis|p}
-  % disparage disparaging ...
+\nolig{despot}{des|pot}
+\nolig{Despot}{Des|pot}
+  % despot despotic
+
+\nolig{spresso}{s|presso}
+
+  \nolig{despon}{de|spon} 
+  \nolig{Despon}{De|spon}
+  \nolig{despir}{de|spir}
+  \nolig{Despir}{De|spir}
+  \nolig{despoil}{de|spoil}
+  \nolig{Despoil}{De|spoil}
+  \nolig{sidesp}{side|sp} % sidespin, sidesplitting	
+  \nolig{Sidesp}{Side|sp}
+  \nolig{widesp}{wide|sp} % widespread
+  \nolig{Widesp}{Wide|sp}
+  \nolig{desprung}{Wide|sp} % gelandesprung
+
+\nolig{dispa[rst]}{dis|pa}
+\nolig{Dispa[rst]}{Dis|pa}
+  % disparage disparaging dispart
+  % dispassion dispatch
+\nolig{dispel}{dis|pel}
+\nolig{Dispel}{Dis|pel}
+  % dispel
+\nolig{dispen[ds]}{dis|pen}
+\nolig{Dispen[ds]}{Dis|pe}
+  % dispend dispense dispensation
+\nolig{displa[cny]}{dis|pla}
+\nolig{Displa[cny]}{Dis|pla}
+  % display displant displace
+\nolig{displea}{dis|plea}
+\nolig{Displea}{Dis|plea}
+  % displease displeasure
+\nolig{displ[ou]}{dis|pl}
+\nolig{Displ[ou]}{Dis|pl}
+  % displode displume
+\nolig{disp[ou]}{dis|p}
+\nolig{Disp[ou]}{Dis|p}
+  % disport dispose disposition 
+  % dispossess dispute
+\nolig{dispr[aio]}{dis|pr}
+\nolig{Dispr[aio]}{Dis|pr}
+  % dispraise disprize disproof 
+  % disproportion disprove
+
 
 \nolig{misp}{mis|p}
 \nolig{Misp}{Mis|p}
@@ -515,22 +547,22 @@
 
 \nolig{risprud}{ris|prud}
   % jurisprudence
-\nolig{spiec}{s|piec}
+\nolig{spiece}{s|piece}
   % crosspiece frontispiece
 
-\nolig{ewspa}{ews|pa}
-  % newspaper 
-\nolig{ewspr}{ews|pr}
-  % newsprint
-  % Don't suppress sp lig in "newspeak"!
+\nolig{ewsp[ae]}{ews|p}
+  % newspaper newsprint
 
 \nolig{Hyannisp}{Hyannis|p}
   % Hyannisport
-\nolig{Keyespo}{Keyes|po}
+\nolig{Keyesp}{Keyes|p}
   % Keyesport
 \nolig{Williamsp}{Williams|p}
   % Williamsport
 
+\nolig{assport}{ass|port} 
+  % passport
+
 
 % (D) th -> t-h
 % -------------
@@ -562,6 +594,8 @@
   % apartheid antiapartheid
 \nolig{thead}{t|head}
   % bolthead cathead fathead ...
+\nolig{thard}{t|hard}
+  % Gotthard 
 \nolig{therd}{t|herd}
   % goatherd neatherd
 \nolig{theap}{t|heap}
@@ -578,6 +612,9 @@
   % pothunt outhunt
 \nolig{orthol}{ort|hol}
   % porthole
+\nolig{posth}{post|h}
+\nolig{Posth}{post|h}
+  % postharvest
 \nolig{sthum}{st|hum}
   % posthumous
 \nolig{uthau}{ut|hau}
@@ -812,14 +849,23 @@
 % (G) as -> a-s 
 % -------------
 
+\nolig{asea}{a|sea}
+  % asea
+  \keeplig{casea}  % casease caseate
+  \keeplig{Casea}
+  \keeplig{haseal} % phaseal
+\nolig{asplut}{a|splut}
+  % asplutter
 \nolig{eastran}{ea|stran}
   % seastrand
-\nolig{aspore}{a|spore}
+\nolig{aspor[ae]}{a|spor}
   % diaspora megaspore tetraspore
-\nolig{aseps}{a|seps}
-  % asepsis
-\nolig{asept}{a|sept}
-  % aseptic aseptically
+\nolig{asep[st]}{a|sep}
+  % asepsis aseptic aseptically
+\nolig{asophist}{a|sophist}
+  % ultrasophisticated
+\nolig{asound}{a|sound}
+  % ultrasound
 \nolig{asund}{a|sund}
 \nolig{Asund}{A|sund}
   % asunder
@@ -839,7 +885,6 @@
 \nolig{aspoon}{a|spoon}
   % teaspoon
 
-% how to do 'asea'?
 
 % (H) is -> i-s 
 % -------------
@@ -851,63 +896,40 @@
 \nolig{fist}{fi|st}
 \nolig{Fist}{Fi|st}
 
+
 % (b) across morpheme boundaries
 
 %% Mustn't do global \nolig{antis}{anti|s}
 %% because of words such as sycophantism, 
 %% vigilantism, and mantissa.
 
-\nolig{antisa}{anti|sa}
-\nolig{Antisa}{Anti|sa}
+\nolig{antis[ace]}{anti|s}
+\nolig{Antis[ace]}{Anti|s}
   % antisag antisatellite
-\nolig{antisc}{anti|sc}
-\nolig{Antisc}{Anti|sc}
   % antiscience 
-\nolig{antise}{anti|se}
-\nolig{Antise}{Anti|se}
   % antisecrecy antisense antiseptic
-\nolig{antisha}{anti|sha}
-\nolig{Antisha}{Anti|sha}
-  % antishark antiship antishock
-\nolig{antishi}{anti|shi}
-\nolig{Antishi}{Anti|shi}
+\nolig{antish[aio]}{anti|sh}
+\nolig{Antish[aio]}{Anti|sh}
   % antishark antiship antishock
-\nolig{antisho}{anti|sh}
-\nolig{Antisho}{Anti|sh}
-  % antishark antiship antishock
-\nolig{antisk}{anti|sk}
-\nolig{Antisk}{Anti|sk}
+\nolig{antis[kl]}{anti|s}
+\nolig{Antis[kl]}{Anti|s}
   % antiskid
-\nolig{antisl}{anti|sl}
-\nolig{Antisl}{Anti|sl}
   % antislavery antislip 
-\nolig{antismo}{anti|smo}
-\nolig{Antismo}{Anti|smo}
+\nolig{antism[ou]}{anti|sm}
+\nolig{Antism[ou]}{Anti|sm}
   % antismog antismoke 
-\nolig{antismu}{anti|smu}
-\nolig{Antismu}{Anti|smu}
   % antismuggling antismut
-\nolig{antisn}{anti|sn}
-\nolig{Antisn}{Anti|sn}
+\nolig{antis[noptuy]}{anti|s}
+\nolig{Antis[noptuy]}{Anti|s}
   % antisnob
-\nolig{antiso}{anti|so}
-\nolig{Antiso}{Anti|so}
   % antisocial antisolar
-\nolig{antisp}{anti|sp}
-\nolig{Antisp}{Anti|sp}
   % antispasmodic antispeculative
-\nolig{antist}{anti|st}
-\nolig{Antist}{Anti|st}
   % antistatic antistick antistress 
-\nolig{antisu}{anti|su}
-\nolig{Antisu}{Anti|su}
   % antisubmarine antisubversion 
-\nolig{antisy}{anti|sy}
-\nolig{Antisy}{Anti|sy}
   % antisymmetric antisyphilitics 
 
-\nolig{multis}{multi|s}
-\nolig{Multis}{Multi|s}
+\nolig{multis[a-z]}{multi|s}
+\nolig{Multis[a-z]}{Multi|s}
   % multiscreen multisense multisensory
   % multiservice multisided multisite
   % multisize multiskilled multisource
@@ -919,6 +941,7 @@
 
 \nolig{isph}{i|sph}
   % hemisphere planisphere hemispheric
+  \keeplig{isphr} % misphrase misphrased ...
 
 % (I) us -> u-s
 % -------------
@@ -977,6 +1000,7 @@
 \nolig{ij}{i|j} 
   \keeplig{ijs} % rijsttafel (Indonesian dish)
   \keeplig{ijn} % de Bruijn
+  \keeplig{eije}% Meijer
 
 
 
@@ -992,8 +1016,8 @@
 \nolig{ust}{u|st}
 \nolig{ist}{i|st}
 
-% (ii) as, is, and us preceding sp
-% .................--.............
+% (ii) as, es, is, and us preceding sp
+% .............................-......
 
 \nolig{aspar}{a|spar}
 \nolig{Aspar}{A|spar}
@@ -1019,10 +1043,18 @@
 \nolig{Wasp}{Wa|sp}
   % wasp waspish
 
+
+\nolig{espi[ct]}{e|spi}
+  % despicable despite
+%%% more rules to come...
+
 \nolig{risp}{ri|sp}
   % crisp 
 \nolig{ispani}{i|spani}
   % hispanic
+\nolig{hispid}{hi|spid}
+\nolig{Hispid}{Hi|spid}
+  % hispid hispidulous
 \nolig{lisp}{li|sp}
 \nolig{Lisp}{Li|sp}
   % lisp lisping 
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 3df9291a1c3..941658f5b1d 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/08/08]
+[2013/08/26]
 
 % This entire package is placed under the
 % terms of the LaTeX Project Public License,
@@ -103,6 +103,7 @@ flagg-schiff-la-den
 fjord-ähn-lich fjord-ar-tig
 fjord-ähn-li-che fjord-ar-ti-ge
 fjord-ähn-li-chen fjord-ar-ti-gen
+form-pflicht form-pflich-ten form-pflich-tig
 fünf-la-gig fünf-la-gi-ge fünf-la-gi-gem
 fünf-län-der fünf-län-der-kampf 
 fünf-lap-pig fünf-lap-pi-ge fünf-lap-pi-gen
@@ -183,6 +184,7 @@ huf-trag-rand huf-trag-ran-des
 impf-la-bo-ra-to-ri-um impf-lan-zet-te impf-le-gen-de
 impf-lü-cke impf-lü-cken impf-lun-ge impf-lun-gen
 impf-lü-cken-schlies-sung
+im-pres-sum-pflicht im-pres-sum-pflich-tig
 in-dus-trie-flair in-dus-trie-flot-te in-dus-trie-flot-ten
 in-nen-hof-fries
 kampf-ideo-lo-gie kampf-ideo-lo-gi-en 
@@ -208,6 +210,7 @@ kla-vier-schleif-lack-ober-flä-che
 kleb-stoff-tu-be kleb-stoff-tu-ben knoepff-ler 
 kleie-flo-cken
 knie-fli-cken
+kon-sum-pflicht kon-sum-pflich-tig
 krampf-la-chen
 koh-len-stoff-te-tra-chlo-rid
 kopf-fleisch kopf-leer kopf-lee-re 
@@ -263,6 +266,7 @@ na-tri-um-dampf-lam-pe na-tri-um-dampf-lam-pen
 na-tri-um-dampf-leuch-te na-tri-um-dampf-leuch-ten
 neu-fünf-land neu-fünf-län-der
 ni-veau-flä-che ni-veau-flä-chen
+norm-pflicht norm-pflich-tig norm-pflich-ti-ge
 nos-tal-gie-fla-sche nos-tal-gie-fla-schen
 nos-tal-gie-floh-markt not-durft-röh-re
 null-auf-fül-lung null-auf-fül-lun-gen
@@ -354,7 +358,8 @@ schmug-gel-auf-trag schmug-gel-auf-tra-ges
 schmug-gel-auf-trags
 schnüf-fel-dro-ge schnüf-fel-dro-gen
 schopf-li-lie schopf-li-li-en
-schrumpf-lack schrumpf-la-cke schrumpf-lo-tion
+schrumpf-lack schrumpf-la-cke 
+schrumpf-licht schrumpf-lo-tion
 schul-hof-fa-schis-mus schul-hof-lärm
 schürf-li-zenz schürf-li-zen-zen
 schürf-loch schürf-lö-cher schürf-lö-chern 
@@ -440,6 +445,7 @@ tüpf-li-scheis-ser tüpf-li-schies-ser
 über-lauf-trich-ter über-lauf-trich-tern 
 über-lauf-trich-ters
 ul-tra-hoch-auf-lö-sung ul-tra-hoch-auf-lö-sun-gen
+uni-form-pflicht
 va-ri-eté-auf-füh-rung va-ri-eté-auf-füh-run-gen
 ver-eins-auf-lö-sung ver-eins-auf-lö-sun-gen
 ver-kauf-the-ke ver-kauf-the-ken
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 f12cd120a8c..8d1621c8424 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/08/08]
+[2013/08/26]
 
 % This entire package is placed under the
 % terms of the LaTeX Project Public License,
@@ -161,6 +161,8 @@
   % Totenkopffahne Dorffahne Wahlkampffahnen
 \nolig{ffahr}{f|fahr}
   % Schifffahrt Schleiffahrt Tariffahrplan
+  \keeplig{iffahrt} 
+    % Schiffahrt [alte Rechtschreibung...]
 \nolig{ffähr}{f|fähr}
   % Dampffährdienst
 \nolig{ffaktor}{f|faktor}
@@ -1000,6 +1002,10 @@
   \keeplig{huffleb} % shuffleboard
 \nolig{flehn}{f|lehn}
   % steiflehnig
+  \keeplig{nflehn} % anflehn dahinflehn
+      % Seelenflehn (Faust I)
+  \keeplig{rflehn} % erflehn Schwesterflehn
+  \keeplig{Hoflehn} % Hof[f]flehner (arch.)
 \nolig{flehr}{f|lehr}
   % Dorflehrer Eislauflehrerin
 \nolig{fleiden}{f|leiden}
@@ -1021,7 +1027,7 @@
   % Schenkelklopflektüre
 \nolig{fler}{f|ler}
   % Freiberufler Löffler Büffler Schnüffler Höfler
-  \keeplig{Hoefler} % a famous font designer!
+  \keeplig{Hoefler} % famous American font designer
 \nolig{fleut}{f|leut}
   % Hofleute Kaufleute
 
@@ -1074,10 +1080,12 @@
 \nolig{flohn}{f|lohn}
   % Tariflohn Tieflohnland
   \keeplig{flohnetz} % Wasserflohnetz
+  \keeplig{ntflohn}  % entflohn (Faust I)
 \nolig{flöhn}{f|löhn}
   % Tariflöhne
 \nolig{flok}{f|lok}
-  % Dampflokomotive
+  % Dampflokomotive dampflokartig
+  % Dorflokal Trefflokal 
 \nolig{flord}{f|lord}
   % Wolflord
 \nolig{flösch}{f|lösch}
@@ -1304,9 +1312,6 @@
 \nolig{Stoffl}{Stoff|l}
 \nolig{stoffl}{stoff|l}
   % lots of words...
-\nolig{Treffl}{Treff|l}
-\nolig{treffl}{treff|l}
-  % Trefflokal
 
 \nolig{afflu}{aff|lu}
   % Gafflust
diff --git a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.lua
index 6b2931190f0..272489a5448 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.254",
-   date         = "2013/08/08",
+   version      = "0.256",
+   date         = "2013/08/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 6ced0b0d924..3620cadc0fd 100644
--- a/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty
+++ b/Master/texmf-dist/tex/lualatex/selnolig/selnolig.sty
@@ -13,21 +13,22 @@
 % ---------------------
 
 \def\selnoligpackagename{selnolig}
-\def\selnoligpackageversion{0.254}
-\def\selnoligpackagedate{2013/08/08}
+\def\selnoligpackageversion{0.256}
+\def\selnoligpackagedate{2013/08/26}
 
-% Announce who we are. Issue warning message if we're
-% not running under LuaLaTeX.
+% Announce who we are. 
 
 \typeout{=== Package \selnoligpackagename, 
              Version \selnoligpackageversion, 
              Date    \selnoligpackagedate\space ===}
 \ProvidesPackage{selnolig}[\selnoligpackagedate]
 
-\RequirePackage{ifluatex}
 
+% Issue warning message if not running under LuaLaTeX.
+
+\RequirePackage{ifluatex}
 \ifluatex
-  \RequirePackage{luatexbase,luacode,expl3}
+  \RequirePackage{luatexbase}
 \else
   \typeout{ ======================================= }
   \typeout{      WARNING   WARNING    WARNING       }
@@ -101,13 +102,12 @@
 % Among them are the "standard five" (ff, fi, fl, ffi,
 % and ffl) ligatures as well as the ft ligature.
 %
-% Two options to override this "basic" setting:
-% - broadf  Many more non-ligation rules for f-ligatures,
-%            incl. fb, fh, fj, and fk character pairs.
+% Two options to augment the "basic" setting:
+% - broadf   More non-ligation rules for f-ligatures
 % - hdlig    Additional ligature suppression rules for 
 %            'historic' and/or 'discretionary' ligatures, 
 %            e.g., ct, sp, st, sk, th, as, is, us, fr, 
-%            ll, et, at, and ta.
+%            ll, et, at, and ta
 
 \newif\if@broadfset\@broadfsetfalse
 \DeclareOption{broadf}{\@broadfsettrue}
@@ -115,6 +115,11 @@
 \newif\if@hdligset\@hdligsetfalse 
 \DeclareOption{hdlig}{\@hdligsettrue}
 
+% The 'basic' option automatically sets the preceding 
+% Booleans to 'false'. 
+
+\DeclareOption{basic}{\@broadfsetfalse\@hdligsetfalse}
+
 
 % The package also provides hyphenation exception 
 % patterns for English and German language words. 
@@ -126,15 +131,9 @@
 \DeclareOption{noadditionalhyphenationpatterns}{\@addlhyphfalse}
 
 
-% The 'basic' option automatically sets the preceding 
-% Booleans to 'false', even if historic and/or rare 
-% ligatures are enabled
-
-\DeclareOption{basic}{\@broadfsetfalse\@hdligsetfalse}
-
 
 % The option 'noftligs' serves to suppress ft and fft
-% ligatures *globally*; default value: 'false'.
+% ligatures *globally*. Default value: 'false'.
 
 \newif\if@noftligs\@noftligsfalse
 \DeclareOption{noftligs}{\@noftligstrue}
@@ -151,11 +150,13 @@
 % Finally, process all options
 \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
 % ----------------------------------------------------
 
@@ -176,8 +177,11 @@
   \selnoligon
   
   
-  % Record operations of selnolig package to the log 
-  % file: Enabled via '\debugon' command
+  % Recording operations of selnolig package to the log 
+  % file is enabled via the '\debugon' command. 
+  % Note: the default value of 'debug' (set in 
+  %    'selnolig.lua') is 'false'. To turn off logging 
+  % of selnolig's activity, use the command \debugoff.
   \newcommand\debugon{%
      \directlua{ debug=true }
   }
@@ -202,46 +206,45 @@
      }
   }
 
-  % A third user macro turns ligature suppression
-  % off temporarily:
+  % A third user macro turns ligature suppression off
+  % temporarily:
   \newcommand\uselig[1]{%
     \directlua{ enable_suppression(false) }%
     \mbox{#1}%
     \directlua{ enable_suppression(true) }%
   }
 
+  % A fourth user macro: '\breaklig'. This is  
+  % hopefully easier to remember than having to 
+  % type "\-\hspace{0pt}".
+
+  \newcommand{\breaklig}{\-{\hspace{0pt}}}
+
 
 \else
   % If *not* running under LuaLaTeX, provide dummy
-  % definitions for package's user macros.
+  % definitions for package's four main user macros
+  % as well as for the auxilliary macros \selnoligon,
+  % \selnoligoff, \debugon, and \debugoff.
   \newcommand{\nolig}[2]{}
   \newcommand{\keeplig}[1]{}
   \newcommand{\uselig}[1]{\mbox{#1}}
+  \newcommand{\breaklig}{\-{\hspace{0pt}}} 
   \let\selnoligon\relax
   \let\selnoligoff\relax
   \let\debugon\relax
   \let\debugoff\relax
-\fi
 
-
-% A fourth user macro: '\breaklig'. This is hopefully 
-% easier to remember than having to type "\-\hspace{0pt}".
-% (It's defined outside the \ifluatex conditional since
-% it doesn't use any lua code.)
-
-\newcommand\breaklig{\-{\hspace{0pt}}}
+\fi
 
 
 % Part 3: What to do if the 'english' option is set
 % -------------------------------------------------
 
 \if@english
-   % load English-language ligature suppression rules
-   \ifluatex
+   \ifluatex % English ligature suppression rules
       \RequirePackage{selnolig-english-patterns}
    \fi
-
-   % load additional hyphenation exception patterns
    \if@addlhyph
       \RequirePackage{selnolig-english-hyphex}
    \fi
@@ -252,12 +255,9 @@
 % -------------------------------------------------
 
 \if@german
-   % load German-language ligature suppression rules
-   \ifluatex
+   \ifluatex % German ligature suppression rules
       \RequirePackage{selnolig-german-patterns}
    \fi
-
-   % load additional hyphenation exception patterns
    \if@addlhyph
       \RequirePackage{selnolig-german-hyphex}
    \fi