diff options
15 files changed, 90 insertions, 87 deletions
diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-bugreport.tex b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-bugreport.tex index ed0c155c420..3d0eb810adf 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, 2013/06/12 +% selnolig-bugreport.tex, 2013/06/30 \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 Binary files differindex 5e20074a587..840f7a4a2bf 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.pdf +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-english-test.pdf 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 dd47782f6f3..bd7e9a7c4e6 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: 2013/06/12 +% Date: 2013/06/30 % Check first that we're running Lua(La)TeX. \usepackage{ifluatex} @@ -56,7 +56,7 @@ \parskip=0.3\baselineskip \usepackage{multicol} \setlength\columnseprule{.4pt} -\title{selnolig-english-test} +\title{selnolig-english-test\\ (Package version: \selnoligpackageversion; \selnoligpackagedate)} \author{\null} \date{} @@ -64,7 +64,7 @@ \maketitle \begin{tabular}{@{}*{10}{l}} -Appearance of f-ligatures +Appearance of ``common'' ligatures &ff &fi &fl &ffi &ffl &ft & \mbox{fj} & {\ebg\mbox{fk}} & \emph{fr}\\ Sample words with these ligatures @@ -74,15 +74,15 @@ Sample words with these ligatures \bigskip -\begin{tabular}{@{}*{13}{l}} -Appearance of other ligatures +\begin{tabular}{@{}*{14}{l}} +Appearance of ``discretionary'' ligatures & st & ct & sp & \emph{as} & \emph{is, th, us} - & \emph{at} & \emph{et} & {\ebg\emph{sk}}& \emph{ll}\\ + & \emph{at} & \emph{et} & {\ebg\emph{sk}}& \emph{ll} & \emph{\uselig{ij}, st, ta}\\ Sample words with these ligatures & stay & act & spy & \emph{was} & \emph{\mbox{is}thmus} & \emph{cat} & \emph{net} - & {\ebg\emph{ask}} & \emph{ill}\\ + & {\ebg\emph{ask}} & \emph{ill} & \emph{rijsttafel}\\ \end{tabular} @@ -91,8 +91,8 @@ Sample words with these ligatures \makeatletter \begin{tabular}{@{}ll} Options and other parameters:\\ -Value of \texttt{\textbackslash righthyphenmin} parameter & \the\righthyphenmin\\ -Extent of suppressing f-ligatures: basic or broadf? & \if@broadfset broadf \else basic \fi \\ +\ \ \ Value of \texttt{\textbackslash righthyphenmin} parameter & \the\righthyphenmin\\ +\ \ \ Extent of suppressing f-ligatures: basic or broadf? & \if@broadfset broadf \else basic \fi \\ \end{tabular} \makeatother 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 e8726ccac1b..f69b0ea2aeb 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: 2013/06/12 +% Last updated: 2013/06/30 % For use with the 'selnolig' package and the % driver program 'selnolig-english-test.tex'. @@ -11,16 +11,16 @@ \begin{itemize} -\item ff to f\hspace{0pt}f +\item ff to f\kern0pt f shelfful shelffuls bookshelfful selffulfilling -\item fi to f\hspace{0pt}i +\item fi to f\kern0pt i (None in basic set) -\item fl to f\hspace{0pt}l +\item fl to f\kern0pt l beefless briefless hoofless leafless roofless selfless turfless selflessly selflessness @@ -34,15 +34,15 @@ halflines rooflines leaflet leaflets leafleted leafleting leafletting leafletted leafleteer -pdflatex (even better: pdfLaTeX or pdf\LaTeX\ldots) +pdflatex (even better: pdfLaTeX or pdf\LaTeX) -\item ffi to ff\hspace{0pt}i +\item ffi to ff\kern0pt i Pfaffian Wolffian Wulffian -\item ffl to ff\hspace{0pt}l +\item ffl to ff\kern0pt l cuffless stuffless cufflessly stufflessness @@ -55,17 +55,17 @@ offload offloads offloading offloaded rufflike clifflike -\item ffi to f\hspace{0pt}fi +\item ffi to f\kern0pt fi chaffinch chaffinches wolffish wolffishly -\item ffl to f\hspace{0pt}fl +\item ffl to f\kern0pt fl safflower -\item ft to f\hspace{0pt}t +\item ft to f\kern0pt t chieftain chieftaincy chieftaincies chieftainship chieftainships @@ -79,12 +79,12 @@ fifth fifths fifthly twelfth twelfths -\item \emph{fr} to \emph{f\hspace{0pt}r} (italic font shape only) +\item \emph{fr} to \emph{f\kern0pt r} (italic font shape only) \emph{proofread proofreader proofroom} -\item \bgroup \ebg \mbox{fb}, \mbox{fh}, \mbox{fj}, and \mbox{fk} ligatures \egroup +\item \bgroup \ebg \uselig{fb}, \uselig{fh}, \uselig{fj}, and \uselig{fk} ligatures \egroup halfback golfball goofball wolfberry halfbeak hoofbeat surfbird surfboard surfboarder surfboat @@ -109,12 +109,12 @@ offkey \begin{itemize} -\item ff to f\hspace{0pt}f +\item ff to f\kern0pt f (No extra cases in broadf set) -\item fi to f\hspace{0pt}i +\item fi to f\kern0pt i elfin @@ -145,12 +145,12 @@ beefiest comfiest goofiest gulfiest leafiest surfiest turfiest beefily goofily goofiness -\item fl to f\hspace{0pt}l +\item fl to f\kern0pt l aloofly briefly chiefly deafly liefly -\item ffi to ff\hspace{0pt}i +\item ffi to ff\kern0pt i baffing biffing outbluffing bluffing boffing buffing chaffing cheffing chuffing coffing coiffing handcuffing uncuffing cuffing daffing doffing enfeoffing infeoffing feoffing fluffing gaffing gruffing huffing luffing miffing muffing offing piaffing puffing quaffing rebuffing reffing restaffing restuffing riffing crossruffing overruffing underruffing ruffing sclaffing scoffing scuffing shroffing sluffing sniffing snuffing spiffing overstaffing understaffing staffing stiffing overstuffing stuffing tariffing tiffing waffing whiffing yaffing @@ -169,22 +169,22 @@ fluffiness huffiness iffiness puffiness scruffiness sniffiness spiffiness stuffi baffies biffies jiffies stuffies taffies toffies waffie waffies -\item ffl to ff\hspace{0pt}l +\item ffl to ff\kern0pt l bluffly gruffly ruffly snuffly stiffly -\item ffi to f\hspace{0pt}fi +\item ffi to f\kern0pt fi (No extra cases in broadf set) -\item ffl to f\hspace{0pt}fl +\item ffl to f\kern0pt fl (No extra cases in broadf set) -\item ft to f\hspace{0pt}t +\item ft to f\kern0pt t fifty fiftyish @@ -201,12 +201,12 @@ fifteen fifteens fifteenth fifteenths \begin{itemize} -\item ct to c\hspace{0pt}t +\item ct to c\kern0pt t arctangent coarctation -\item st to s\hspace{0pt}t +\item st to s\kern0pt t First, some words with ``th'' (from $\theta$ or $\vartheta$) after ``s'': @@ -230,7 +230,7 @@ Maastricht -\item sp to s\hspace{0pt}p +\item sp to s\kern0pt p First, some words with ``ph'' (from $\phi$ or $\varphi$) after ``s'': @@ -357,7 +357,7 @@ Note: The test words in the remainder of this document are generally set in \emp \begin{itemize} -\item \emph{th} to \emph{t\hspace{0pt}h} +\item \emph{th} to \emph{t\kern0pt h} \bgroup \em @@ -395,14 +395,14 @@ posthumous posthumously pothunt warthog watthour kilowatthour \egroup -\item \emph{at} to \emph{a\hspace{0pt}t} +\item \emph{at} to \emph{a\kern0pt t} \bgroup \em anathema aromatherapy intrathoracic metathesis ultrathin ultrathick \egroup -\item \emph{et} to \emph{e\hspace{0pt}t} +\item \emph{et} to \emph{e\kern0pt t} \bgroup \em ninetieth ninetieths ninety nineteen @@ -462,7 +462,7 @@ subtlety teletype teletypewriter \egroup -\item \emph{as} to \emph{a\hspace{0pt}s} +\item \emph{as} to \emph{a\kern0pt s} \bgroup \em @@ -473,7 +473,7 @@ infraspecific intraspecies intraspecific \egroup -\item \emph{is} to \emph{i\hspace{0pt}s} +\item \emph{is} to \emph{i\kern0pt s} \bgroup \em @@ -483,7 +483,7 @@ antisag antisatellite antiscience antisecrecy antisense antiseptic antishark ant \egroup -\item {\ebg\emph{\mbox{sk}}} to {\ebg{\emph{s\hspace{0pt}k}}} (EB Garamond) +\item {\ebg\emph{\uselig{sk}}} to {\ebg{\emph{s\kern0pt k}}} (EB Garamond) \bgroup \ebg \em greenskeeper groundskeeper @@ -498,7 +498,7 @@ Catskills Peekskill -\item \emph{ll} to \emph{l\hspace{0pt}} +\item \emph{ll} to \emph{l\kern0pt l} \bgroup \em animallike bowllike eellike jewellike owllike petallike seallike snaillike soullike taillike tunnellike veillike woollike @@ -507,7 +507,7 @@ bowelless coalless goalless heelless idealless keelless mailless mealless recoil \egroup -\item \emph{\mbox{ij}} to \emph{ij} +\item \emph{\uselig{ij}} to \emph{ij} \bgroup \em antijam hijack demijohns hijinks @@ -568,7 +568,7 @@ administer statistics statistically activist agronomist biologist \emph{etc.} -\ \ \ \emph{but:} m\mbox{is}think m\mbox{is}throw cal\mbox{is}thenic +\ \ \ \emph{but:} m\uselig{is}think m\uselig{is}throw cal\uselig{is}thenic diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.pdf b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.pdf Binary files differindex bfad64017fb..5ea3b5fe7eb 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.pdf +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig-german-test.pdf 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 d2dfb0aeae8..8a189efe685 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: 2013/06/12 +% Date: 2013/06/30 % Check first that we're running lua(la)tex. \usepackage{ifluatex} @@ -39,7 +39,7 @@ \usepackage{showhyphens} \usepackage{multicol} \setlength\columnseprule{.4pt} -\title{selnolig-german-test} +\title{selnolig-german-test\\ (Package version: \selnoligpackageversion; \selnoligpackagedate)} \author{\null} \date{} \begin{document} 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 b3b72a2cd69..414614dc2e8 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: 2013/06/12 +% Last updated: 2013/06/30 % For use with the 'selnolig' package and the % driver program 'selnolig-german-test.tex'. @@ -818,15 +818,15 @@ Senftopf Senftöpfchen Freiwurftor Surftour Dorftourismus \bgroup\ebg -\section*{Wörter, für welche man \mbox{fb}-, \mbox{fh}-, \mbox{fj}- und \mbox{fk}-Ligaturen vermeiden sollte} +\section*{Wörter, für welche man \uselig{fb}-, \uselig{fh}-, \uselig{fj}- und \uselig{fk}-Ligaturen vermeiden sollte} \egroup -(Einige wenige Beispiele genügen\ldots) +Einige wenige Beispiele genügen\ldots \begin{itemize} \bgroup\ebg -\item \mbox{fb} und \mbox{ffb} +\item \uselig{fb} und \uselig{ffb} \egroup abrufbar @@ -879,7 +879,7 @@ Wasserstoffbombe Wiederaufbau \bgroup\ebg -\item \mbox{fh} und \mbox{ffh} +\item \uselig{fh} und \uselig{ffh} \egroup aufhaben aufhacken aufhalsen aufhalten aufhatte aufheben aufheitern aufheizen aufhelfen aufhellen aufhetzen aufheulen aufholen aufhorchen aufhängen aufhören aufhübschen @@ -934,7 +934,7 @@ Werkstoffhof \bgroup\ebg -\item \mbox{fj} und \mbox{ffj} +\item \uselig{fj} und \uselig{ffj} \egroup aufjagen aufjaulen aufjauchzen aufjohlt @@ -965,7 +965,7 @@ Golfjahr Golfjunge Golfjunioren Golfjuniorinnen \bgroup\ebg -\item \mbox{fk} und \mbox{ffk} +\item \uselig{fk} und \uselig{ffk} \egroup aufkam aufkaufen aufkeimen aufkehren aufklaffen aufkläffen aufklappen aufklatschen aufklauben aufkleben aufklären aufklingen aufklopfen aufknacken aufknöpfen aufknüpfen aufkochen aufkommen aufkreischen aufkrempeln aufkreuzen aufkriegen aufkurbeln aufkündigen diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig.pdf b/Master/texmf-dist/doc/lualatex/selnolig/selnolig.pdf Binary files differindex 1fcbac9e1a3..c9dffaa7585 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig.pdf +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig.pdf diff --git a/Master/texmf-dist/doc/lualatex/selnolig/selnolig.tex b/Master/texmf-dist/doc/lualatex/selnolig/selnolig.tex index 3a23c22c5ca..27107e83960 100644 --- a/Master/texmf-dist/doc/lualatex/selnolig/selnolig.tex +++ b/Master/texmf-dist/doc/lualatex/selnolig/selnolig.tex @@ -9,7 +9,7 @@ % It has the status "maintained". % % Author: Mico Loretan (loretan dot mico at gmail dot com) -% Date: 2013/06/12 +% Date: 2013/06/30 % Check first that we're running lua(la)tex. \usepackage{ifluatex} @@ -103,7 +103,7 @@ \usepackage{fancyvrb} \DefineShortVerb{\|} -% Set up logos for LuaLaTeX and XeLaTeX +% "ogos for "LuaLaTeX" and "XeLaTeX" \usepackage{metalogo} \makeatletter \def\xl@drop@TeX@e{0.34ex} % default: 0.5ex @@ -310,15 +310,16 @@ Unless the |broadf| option is set (see below), typographic ligatures are suppres \item if a prefix (usually either a free or a derivational morpheme) and main word are joined: \uselig{offload} $\to$ offload, \uselig{mistrust}~$\to$ mistrust, \uselig{display}~$\to$ display, etc. -\item if a main word and a suffix are joined, \emph{if} the suffix is a derivational morpheme that begins with an~f or an~l (other than \enquote{ly}): \uselig{shelfful}~$\to$ shelfful, \uselig{leafless} $\to$ leafless, \uselig{dwarflike}~$\to$ dwarflike, etc. +\item if a main word and a suffix are joined, \emph{if} the suffix is a derivational morpheme that begins with an~f or an~l (other than \enquote{ly}): \uselig{shelfful}~$\to$ shelfful, \uselig{leafless} $\to$ leafless, \uselig{dwarflike}~$\to$ dwarflike, \uselig{leaflet}~$\to$ leaflet, etc. \item The ft ligature is also suppressed in words that end in |fth|: \uselig{fifth}~$\to$ fifth, \uselig{twelfth}~$\to$ twelfth. Note that the particle |th| is a derivational morpheme. Moreover, in English the~|th| character pair is pronounced in a distinctive way. It thus seems inadvisable to obscure its presence with an ft ligature. \end{itemize} -In addition, if the \opt{broadf} option is set, the \pkg{selnolig} package will +In addition, if the \opt{broadf} option is set, the \pkg{selnolig} package will suppress \begin{itemize} -\item suppress fi and ffi ligatures that arise if the main word ends in~f and the suffix starts with an~i, regardless of whether the suffix is a derivational or an inflectional morpheme: elfin, selfish, golfing, surfing, beefier, fluffily, goofiness, standoffish, jiffies, buffiest,~etc. Setting the \opt{broadf} option also instructs \pkg{selnolig} to split up ffi ligatures in words such as fluffiness and fluffily; -\item fl and ffl ligatures in words such as chiefly, briefly, and gruffly as well as ft ligatures in words such as fifty and fiftieth.\footnote{If the ligatures were not disabled, these words would be typeset as chie\uselig{fl}y, brie\uselig{fl}y, gru\uselig{ffl}y, fi\uselig{ft}y, and fi\uselig{ft}ieth, respectively.} +\item fi and ffi ligatures that arise if the main word ends in~f and the suffix starts with an~i, regardless of whether the suffix is a derivational or an inflectional morpheme: elfin, selfish, golfing, surfing, beefier, fluffily, goofiness, standoffish, jiffies, buffiest,~etc. Setting the \opt{broadf} option also instructs \pkg{selnolig} to split up ffi ligatures in words such as fluffiness and fluffily; +\item fl and ffl ligatures in words such as chiefly, briefly, and gruffly; and +\item ft ligatures in words such as fifty and fiftieth.\footnote{If ligatures were not disabled for these words, they would be typeset as \uselig{chiefly}, \uselig{briefly}, \uselig{gruffly}, \uselig{fifty}, and \uselig{fiftieth}, respectively.} \end{itemize} Note that the option \opt{broadf} is \emph{not} enabled by default. This is because I believe that any gain in readability that might result from breaking up the f-ligatures caught by the rules enabled by the \opt{broadf} option would be minor and, importantly, outweighed by the visual clashes created by the unligated~f\kern0pt i, ff\kern0pt i, f\kern0pt l, and ff\kern0pt l glyphs. @@ -329,7 +330,19 @@ Note that the option \opt{broadf} is \emph{not} enabled by default. This is beca For German words, the following principles apply when it comes to deciding which ligatures to break up and which ones to permit. These rules are built mainly from statements found in the \emph{Duden} and various websites that have taken an interest in this subject, with adaptations for the ft and fft ligatures. \begin{itemize} -\item Case 1: Joining of two free morphemes: Ligatures are suppressed if they span the boundary of two \emph{free} morphemes. Examples: Schil\uselig{fi}nsel $\to$ Schilfinsel, Zup\uselig{fi}nstrument $\to$ Zupfinstrument, Bausto\uselig{ffi}ngenieur $\to$ Baustoffingenieur, Wassersto\uselig{ffi}onen $\to$ Wasserstoffionen; Imp\uselig{ff}urcht $\to$ Impffurcht, Sen\uselig{ff}abrik $\to$ Senffabrik, Schor\uselig{ffl}ecken $\to$ Schorfflecken; Ablau\uselig{fl}ogik $\to$ Ablauflogik, fün\uselig{ffi}ngrig $\to$ fünffingrig; Brie\uselig{ft}aube $\to$ Brieftaube, Sto\uselig{fft}eil $\to$ Stoffteil, el\uselig{ft}eilig $\to$ elfteilig, etc. +\item Case 1: Joining of two free morphemes: Ligatures are suppressed if they span the boundary of two \emph{free} morphemes. Examples: +Schil\uselig{fi}nsel $\to$ Schilfinsel, +%Zup\uselig{fi}nstrument $\to$ Zupfinstrument, +\uselig{Baustoffingenieur} $\to$ Baustoffingenieur, +\uselig{Wasserstoffionen} $\to$ Wasserstoffionen; \uselig{Impffurcht} $\to$ Impffurcht, +\uselig{Senffabrik} $\to$ Senffabrik, +Ab\-lau\uselig{fl}ogik $\to$ Ablauflogik, +Schor\uselig{ffl}ecken $\to$ Schorfflecken; +\uselig{fünffing}\-rig $\to$ fünffingrig; +\uselig{Brieftaube} $\to$ Brieftaube, +\uselig{elfteilig} $\to$ elfteilig, +\uselig{Stofftasche} $\to$ Stofftasche, +etc. \item Case 2: Joining of a prefix (whether a free or a derivational morpheme) ending in~|f| and a main word (free morpheme) starting with~|b|, |f|, |h|, |i|, |j|, |k|, |l|, or~|t|. Ligatures are suppressed in this case as well. In German, by far the most common prefix that gives rise to the need to suppress various f-ligatures is the word \enquote{auf}, as in aufbrechen, auffassen, Aufführung, auffliegen, auffischen, aufhören, aufisst, aufjaulen, aufklingen, Auflage, Auftrag, auftreten, etc. @@ -348,7 +361,7 @@ I haven't found a clear justification for this rule so far. I assume it is there \item Interlude I: In ambiguous cases that could give rise to fl-ligatures that involve certain suffixes, preference should be given\textemdash according to \emph{Duden}\textemdash to \enquote{how the syllables are pronounced and how a word would be hyphenated}, leading to a suppression of the fl-ligature. For instance, the fl-ligature is suppressed in Verzweif\-lung, Bezweifler, schweflig, and würflig; note that the real suffixes in these words are |ung|, |er|, and |ig|, respectively, rather than |lung|, |ler|, and |lig|.\footnote{% In my opinion, the rationale given for the suppression of the fl-ligature in these cases\textemdash reliance on how the syllables are divided and how the composite words are hyphenated\textemdash is not entirely satisfactory because, morphologically speaking, the words Schwefel, Würfel, Zweifel, etc.\ contain two morphemes: a stem and the \emph{derivational} morpheme~|el|: \Verb+Schwef|el+, \Verb+Würf|el+, and \Verb+Zweif|el+, etc. It is therefore not necessary, in my opinion, to create a separate rule to justify the (non-)use of the fl-ligature in these cases. One could, instead, rely on the presence of two morphemes to motivate the suppression of the fl-ligature for words such as schweflig, teuflisch, würfle, and Verzweiflung, as their components are \Verb+schwef|[e]l|ig+, etc. However, I believe it's fair to say that most modern German speakers would barely be aware of the fact that the |el| particle constitutes a separate morpheme in words such as Würfel and Griffel, and that they would be entirely unaware of its presence in words such as Schwefel and Zweifel. At any rate, the typographical convention \emph{not} to use the fl-ligature in words such as schweflig, Verzweiflung, and würflig does \emph{not} appear to be based on the fact that letters~f and~l in these words belong to different morphemes.} -This convention may also be applied to justify the non-use of the fl-ligature in words such as knifflig and mufflig as well as in the present-tense/first-person-singular forms of verbs such as büffeln, löffeln, schaufeln, stiefeln, verteufeln, and zweifeln: they are typeset \emph{without} the fl-ligature, i.e., as büffle, löffle, schaufle, stiefle, verteufle, and zweifle, respectively. +This convention may also be applied to justify the non-use of the fl-ligature in words such as knifflig and mufflig as well as in the present-tense/first-person-singular forms of verbs such as büffeln, löffeln, schaufeln, stiefeln, verteufeln, and zweifeln: they are typeset \emph{without} the fl- or ffl-ligature, i.e., as büffle, löffle, schaufle, stiefle, verteufle, and zweifle, respectively. \item Interlude II: If a word \emph{ends} with an |fl| character pair because an abbreviation is in effect, \emph{Duden} says it's OK to use the fl ligature even if the~f and~l characters belong to different morphemes. E.g., in the abbreviation \enquote{Aufl.}, the fl-ligature \emph{is} employed even though the ligature should not be used for the full, unabbreviated form of the word (\emph{viz.}, Auflage). @@ -361,7 +374,7 @@ This convention further suggests (implies?) that it's permissible (a)~to use the \begin{itemize} \item The convention mentioned in \enquote{Interlude II} above, about not breaking up an fl-ligature if it occurs at the very end of a word, may be adapted to the case of~ft and~fft ligatures: these ligatures are allowed \emph{if} they occur at the very ends of words (and at the ends syllables), as in verschärft, gestreift, gerafft, Dahingerafftsein, unbedarft, and Unbedarftheit. Note that in these cases, the ft and fft ligatures \emph{do} span a morpheme boundary: the letter~|t| is an \emph{inflectional} morpheme that indicates a form of conjugation of the associated verb (viz., past tense and/or past participle). -\item Should ft and fft ligatures be broken up in the past-tense and past-participle forms of verbs that do not end in~ft but, rather, in -fte, -ften, -ftes, -ftest, etc? Example words: |streifte|, |schlürftest|, and |rafften|. Because these suffixes are merely \emph{inflectional} rather than derivational morphemes, the \pkg{selnolig} package takes the approach of \emph{not} breaking up the~ft and~fft ligatures in these cases. Thus, the words will be typset as streifte, schlürftes\kern0pt t, and rafften rather than as streif\breaklig te, schlürf\breaklig tes\kern0pt t, and raff\breaklig ten.\footnote{I will concede, again, that I haven't yet come across any kind of authoritative discussion of this issue. Should someone be able to furnish a good counterargument to the setting proposed here, I would be happy to change it.} +\item Should ft and fft ligatures be broken up in the past-tense and past-participle forms of verbs that do not end in~ft but, rather, in -fte, -ften, -ftes, -ftest, etc? Example words: |streifte|, |schlürftest|, and |rafften|. Because these suffixes are merely \emph{inflectional} rather than derivational morphemes, the \pkg{selnolig} package takes the approach of \emph{not} breaking up the~ft and~fft ligatures in these cases. Thus, the words will be typset as streifte, schlürftes\kern0pt t, and rafften rather than as streif\breaklig te, schlürf\breaklig tes\kern0pt t, and raff\breaklig ten.\footnote{I will concede, again, that I haven't yet come across any kind of authoritative discussion of this specific case. Should someone be able to furnish a good counterargument to the setting proposed here, I would be happy to change it.} \item It would also seem OK to use the ft-ligature in expressions such as \enquote{zu fünft} and \enquote{die zwölftschnells\kern0pt te Sprinterin Bayerns}: even though the |t| character represents a derivational morpheme, the ligature occurs at \emph{end} of the word or word fragment. In the case of the word \enquote{zwölftschnells\breaklig te}, the argument for keeping the ft ligature is based on the observation that the entire fragment \enquote{zwölft} serves a prefix to \enquote{schnells\kern0pt te}. @@ -435,9 +448,9 @@ Consider the following example: If the \opt{ngerman} option is set, the package \begin{Verbatim} \nolig{flich}{f|lich} \end{Verbatim} -to break up the fl-ligature in words such as begrifflich, beruflich, brieflich, glimpflich, hilflich, höflich, käuflich, sträflich, tariflich, trefflich, unerschöpflich, and verwerflich (and quite a few more such words), which all contain the suffix |-lich| (a derivational morpheme). This particular \cmmd{nolig} rule also catches the word \enquote{Lauflicht}, which contains the free morphemes |Lauf| and |licht|. +to break up the fl-ligature in words such as begrifflich, beruflich, brieflich, glimpflich, hilflich, höflich, käuflich, s\breaklig träflich, tariflich, trefflich, unerschöpflich, and verwerflich (and quite a few more such words), which all contain the suffix |lich|, a derivational morpheme. This \cmmd{nolig} rule also happens to catch the word \enquote{Lauflicht}, which contains the free morphemes |Lauf| and |licht|. -It turns out to be the case that the scope of this \cmmd{nolig} rule is too broad (or, if you will, insufficiently restrictive): it also catches words\textemdash such as \opt{Pflicht} and \opt{verpflichten}\textemdash for which the fl-ligature should \emph{not} be suppressed. However, rather than provide a large number of slightly more restrictive \cmmd{nolig} rule just to avoid including the Pflicht- and pflicht-words, the package provides the command +It so happens that the scope of this \cmmd{nolig} rule is too broad (or, if you will, insufficiently restrictive), as it also catches words such as \opt{Pflicht} and \opt{verpflichten} for which the fl-ligature should \emph{not} be suppressed. Rather than provide a large number of slightly more restrictive \cmmd{nolig} rules aimed at avoiding catching the Pflicht- and pflicht-words, the package provides the command \begin{Verbatim} \keeplig{flicht} \end{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 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. |