summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/fonts/libris/t1-librisswash.etx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/fonts/libris/t1-librisswash.etx')
-rw-r--r--Master/texmf-dist/source/fonts/libris/t1-librisswash.etx70
1 files changed, 42 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/fonts/libris/t1-librisswash.etx b/Master/texmf-dist/source/fonts/libris/t1-librisswash.etx
index 81b8844dd1b..119f802243c 100644
--- a/Master/texmf-dist/source/fonts/libris/t1-librisswash.etx
+++ b/Master/texmf-dist/source/fonts/libris/t1-librisswash.etx
@@ -1,4 +1,4 @@
-%% Modifications copyright 2008 Clea F. Rees
+%% Modifications copyright 2010 Clea F. Rees
%% Code from t1.etx copyright 2002 Alan Jeffrey and Sebastian
%% Rahtz and Ulrik Vieth and Lars Hellstr{\"o}m (see below)
%%
@@ -38,8 +38,6 @@
%% maintenance etc. are replaced by this notice.
%% - The file is renamed.
%% - The encoding name is modified.
-%% tinkered with by CFR
-%% see original file for commentary
\relax
\encoding
@@ -51,13 +49,29 @@
\setcommand\lctop#1#2{#2}
\setcommand\uctop#1#2{#1}
\setcommand\lclig#1#2{#2}
+\ifisint{letterspacing}\then
+ \ifnumber{\int{letterspacing}}={0}\then \Else
+ \setcommand\uclig#1#2{#1spaced}
+ \comment{Here we set \verb|\uclig#1#2| to \verb|#1spaced|, but
+ you can't see it as \verb|\setcommand| commands are invisible in
+ the typeset output.}
+ \Fi
+\Fi
\setcommand\uclig#1#2{#1}
\setcommand\digit#1{#1}
\ifisint{monowidth}\then
\setint{ligaturing}{0}
\Else
- \setint{ligaturing}{1}
+ % The following empty line is *important* to get the formatting
+ % right here (sigh)! (Remember that it is a \par token.)
+
+ \ifisint{letterspacing}\then
+ \ifnumber{\int{letterspacing}}={0}\then \Else
+ \setint{ligaturing}{0}
+ \Fi
+ \Fi
+ \setint{ligaturing}{1}
\Fi
\setint{italicslant}{0}
@@ -271,7 +285,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{TT}{tt}}
+ \setslot{\lclig{TT}{t_t}}
\comment{The ligature `tt'. This slot is usually assigned to
the perthousandzero but that letter is unavailable in this font.}
\endsetslot
@@ -293,7 +307,7 @@
\setslot{\lclig{FF}{ff}}
\ifnumber{\int{ligaturing}}>{0}\then
\ligature{LIG}{\lc{I}{i}}{\lclig{FFI}{ffi}}
- \ligature{LIG}{\lc{J}{j}}{\lclig{FFJ}{ffj}}
+ \ligature{LIG}{\lc{J}{j}}{\lclig{FFJ}{f_f_j}}
\ligature{LIG}{\lc{L}{l}}{\lclig{FFL}{ffl}}
\Fi
\comment{The `ff' ligature. It should be two characters wide in a
@@ -589,7 +603,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{SP}{sp}}
+ \setslot{\lclig{SP}{s_p}}
\comment{The ligature `sp'. This slot is usually assigned to
asciicircum.}
\endsetslot
@@ -620,10 +634,10 @@
\setslot{\lc{C}{c}}
\ifnumber{\int{ligaturing}}>{0}\then
- \ligature{LIG}{\lc{H}{h}}{\lclig{CH}{ch}}
- \ligature{LIG}{\lc{K}{k}}{\lclig{CK}{ck}}
- \ligature{LIG}{\lc{L}{l}}{\lclig{CL}{cl}}
- \ligature{LIG}{\lc{T}{t}}{\lclig{CT}{ct}}
+ \ligature{LIG}{\lc{H}{h}}{\lclig{CH}{c_h}}
+ \ligature{LIG}{\lc{K}{k}}{\lclig{CK}{c_k}}
+ \ligature{LIG}{\lc{L}{l}}{\lclig{CL}{c_l}}
+ \ligature{LIG}{\lc{T}{t}}{\lclig{CT}{c_t}}
\Fi
\comment{The letter `{c}'.}
\endsetslot
@@ -643,7 +657,7 @@
\setslot{\lc{F}{f}}
\ifnumber{\int{ligaturing}}>{0}\then
\ligature{LIG}{\lc{I}{i}}{\lclig{FI}{fi}}
- \ligature{LIG}{\lc{J}{j}}{\lclig{FJ}{fj}}
+ \ligature{LIG}{\lc{J}{j}}{\lclig{FJ}{f_j}}
\ligature{LIG}{\lc{F}{f}}{\lclig{FF}{ff}}
\ligature{LIG}{\lc{L}{l}}{\lclig{FL}{fl}}
\Fi
@@ -708,11 +722,11 @@
\setslot{\lc{S}{s}}
\ifnumber{\int{ligaturing}}>{0}\then
- \ligature{LIG}{\lc{H}{h}}{\lclig{SH}{sh}}
- \ligature{LIG}{\lc{K}{k}}{\lclig{SK}{sk}}
- \ligature{LIG}{\lc{L}{l}}{\lclig{SL}{sl}}
- \ligature{LIG}{\lc{p}{p}}{\lclig{Sp}{sp}}
- \ligature{LIG}{\lc{T}{t}}{\lclig{ST}{st}}
+ \ligature{LIG}{\lc{H}{h}}{\lclig{SH}{s_h}}
+ \ligature{LIG}{\lc{K}{k}}{\lclig{SK}{s_k}}
+ \ligature{LIG}{\lc{L}{l}}{\lclig{SL}{s_l}}
+ \ligature{LIG}{\lc{p}{p}}{\lclig{Sp}{s_p}}
+ \ligature{LIG}{\lc{T}{t}}{\lclig{ST}{s_t}}
\Fi
\comment{The letter `{s}'.}
\endsetslot
@@ -721,7 +735,7 @@
\setslot{\lc{T}{t}}
\ifnumber{\int{ligaturing}}>{0}\then
- \ligature{LIG}{\lc{T}{t}}{\lclig{TT}{tt}}
+ \ligature{LIG}{\lc{T}{t}}{\lclig{TT}{t_t}}
\Fi
\comment{The letter `{t}'.}
\endsetslot
@@ -766,7 +780,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{SL}{sl}}
+ \setslot{\lclig{SL}{s_l}}
\comment{The ligature `sl'. This slot is usually assigned to
asciitilde.}
\endsetslot
@@ -832,7 +846,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
-\setslot{\lclig{FJ}{fj}}
+\setslot{\lclig{FJ}{f_j}}
\comment{The `fj' ligature. It should be two characters wide in a
monowidth font. In standard T1 encoding this slot is used for Eng/Ng
but that character is unavailable in this font.}
@@ -898,7 +912,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{ST}{st}}
+ \setslot{\lclig{ST}{s_t}}
\comment{The ligature `st'. This slot is usually assigned to
IJ but that letter is unavailable in this font.}
\endsetslot
@@ -911,7 +925,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{CT}{ct}}
+ \setslot{\lclig{CT}{c_t}}
\comment{The ligature `ct'. This slot is usually assigned to
the dbar but that letter is unavailable in this font.}
\endsetslot
@@ -976,7 +990,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
-\setslot{\lclig{FFJ}{ffj}}
+\setslot{\lclig{FFJ}{f_f_j}}
\comment{The `ffj' ligature. It should be two characters wide in a
monowidth font. In standard T1 encoding this slot is used for eng/ng
but that character is unavailable in this font.}
@@ -1042,7 +1056,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{CH}{ch}}
+ \setslot{\lclig{CH}{c_h}}
\comment{The ligature `ch'. This slot is usually assigned to
ij but that letter is unavailable in this font.}
\endsetslot
@@ -1128,7 +1142,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{CK}{ck}}
+ \setslot{\lclig{CK}{c_k}}
\comment{The ligature `ck'. This slot is usually assigned to
Eth.}
\endsetslot
@@ -1190,7 +1204,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{SK}{sk}}
+ \setslot{\lclig{SK}{s_k}}
\comment{The ligature `sk'. This slot is usually assigned to
Thorn.}
\endsetslot
@@ -1269,7 +1283,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{CL}{cl}}
+ \setslot{\lclig{CL}{c_l}}
\comment{The ligature `cl'. This slot is usually assigned to
eth.}
\endsetslot
@@ -1331,7 +1345,7 @@
\ifnumber{\int{ligaturing}}<{0}\then \skipslots{1}\Else
- \setslot{\lclig{SH}{sh}}
+ \setslot{\lclig{SH}{s_h}}
\comment{The ligature `sh'. This slot is usually assigned to
thorn.}
\endsetslot