summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-14 22:43:27 +0000
committerKarl Berry <karl@freefriends.org>2010-06-14 22:43:27 +0000
commit4f7583d5179d45d9bb1f183450e8fba6dfb7cc5f (patch)
treefd18f800eb66dff8213cd242eabc373eab942719 /Master/texmf-dist
parentd94f3638f393bd0be2a67c6f1a8dbbee4de96b1b (diff)
rm dup texnansi, avoid dup augie.ali, autoupdate
git-svn-id: svn://tug.org/texlive/trunk@18980 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/base/texnansi.enc319
-rw-r--r--Master/texmf-dist/tex/texinfo/texinfo.tex18
2 files changed, 15 insertions, 322 deletions
diff --git a/Master/texmf-dist/fonts/enc/dvips/base/texnansi.enc b/Master/texmf-dist/fonts/enc/dvips/base/texnansi.enc
deleted file mode 100644
index cb75386e04a..00000000000
--- a/Master/texmf-dist/fonts/enc/dvips/base/texnansi.enc
+++ /dev/null
@@ -1,319 +0,0 @@
-% @psencodingfile{
-% date = "22apr09",
-% filename = "texnansi.enc",
-% email = "tex-fonts@tug.org",
-% author = "Y&Y, Inc.",
-% version = "1.1",
-% codetable = "ISO/ASCII",
-% docstring = "texnansi (aka LY1) encoding vector for Type 1 fonts to
-% be used with TeX, following ASCII and Windows ANSI."
-% }
-%
-% The idea is to have all 228 characters normally included in Type 1 text
-% fonts (plus a few more) available for typesetting. This is effectively
-% the character set in Adobe Standard Encoding, ISO Latin 1, plus a few more.
-%
-% Character code assignments were made as follows:
-%
-% (1) The character layout largely matches `ASCII' in the 32 -- 126 range,
-% except for `circumflex' in 94 and `tilde' in 126, to match `TeX text'
-% (`asciicircumflex' and `asciitilde' appear in 158 and 142 instead).
-%
-% (2) The character layout matches `Windows ANSI' in almost all places,
-% except for `quoteright' in 39 and `quoteleft' in 96 to match ASCII
-% (`quotesingle' and `grave' appear in 129 and 18 instead).
-%
-% (3) The character layout matches `TeX typewriter' used by CM text fonts
-% in most places (except for discordant positions such as hungarumlaut
-% (instead of braceright), dotaccent (instead of underscore) etc.
-%
-% (4) Remaining characters are assigned arbitrarily to the `control character'
-% range (0 -- 31), avoiding 0, 9, 10 and 13 in case we meet dumb software
-% - similarly one should really avoid 127 and 128 if possible.
-% In addition, the 8 open slots in Windows ANSI between 128 and 159 are used.
-%
-% (5) Y&Y Lucida Bright includes some extra ligatures and such; ff, ffi, ffl,
-% and `dotlessj,' these are included 11 -- 15, and 17.
-%
-% (6) Hyphen appears both at 45 and 173 for compatibility with both ASCII
-% and Windows ANSI.
-%
-% (7) It doesn't really matter where ligatures appear (both real, such as ffi,
-% and pseudo such as ---) since these should not be accessed directly, only
-% via ligature information in the TFM file.
-%
-% SAMPLE USAGE (in `psfonts.map' file for DVIPS):
-%
-% lbr LucidaBright "TeXnANSIEncoding ReEncodeFont" <texnansi.enc <lbr.pfb
-%
-% This tells DVIPS that the font called `lbr' in TeX has PostScript
-% FontName `LucidaBright.' It also asks DVIPS to expand the file `lbr.pfb'
-% into PFA form, to include the attached `texnansi.enc' encoding vector,
-% and to then actually reencode the font based on that encoding vector.
-%
-% Revised 2009 April 20 with doc changes only (Uni20AC -> uni20ac).
-% Revised 2009 March 9 with doc changes only.
-% Revised 1996 June 1 by adding second position for `fl' to avoid Acrobat bug.
-% Revised 1996 June 1 by adding second position for `fraction' for same reason.
-% Revised 1997 Oct 1 by adding cwm (used in boundary char TFM code).
-% Revised 1998 Mar 1 by adding Unicode for Euro character.
-% emacs-page
-%
-/TeXnANSIEncoding [ % now 256 chars follow
-/.notdef % 0x00 0
-/Euro % 0x01 1 /uni20AC
-/.notdef % 0x02 2
-/.notdef % 0x03 3
-/fraction % 0x04 4
-/dotaccent % 0x05 5
-/hungarumlaut % 0x06 6
-/ogonek % 0x07 7
-/fl % 0x08 8
-/.notdef % 0x09 9 /fraction at 4, backward compatibility only
-/cwm % 0x0A 10 not used, except boundary char internally
-/ff % 0x0B 11
-/fi % 0x0C 12
-/.notdef % 0x0D 13 /fl at 8, backward compatibility only
-/ffi % 0x0E 14
-/ffl % 0x0F 15
-/dotlessi % 0x10 16
-/dotlessj % 0x11 17
-/grave % 0x12 18
-/acute % 0x13 19
-/caron % 0x14 20
-/breve % 0x15 21
-/macron % 0x16 22
-/ring % 0x17 23
-/cedilla % 0x18 24
-/germandbls % 0x19 25
-/ae % 0x1A 26
-/oe % 0x1B 27
-/oslash % 0x1C 28
-/AE % 0x1D 29
-/OE % 0x1E 30
-/Oslash % 0x1F 31
-/space % 0x20 32 /suppress in TeX text
-/exclam % 0x21 33
-/quotedbl % 0x22 34 /quotedblright in TeX text
-/numbersign % 0x23 35
-/dollar % 0x24 36
-/percent % 0x25 37
-/ampersand % 0x26 38
-/quoteright % 0x27 39 /quotesingle in ANSI
-/parenleft % 0x28 40
-/parenright % 0x29 41
-/asterisk % 0x2A 42
-/plus % 0x2B 43
-/comma % 0x2C 44
-/hyphen % 0x2D 45
-/period % 0x2E 46
-/slash % 0x2F 47
-/zero % 0x30 48
-/one % 0x31 49
-/two % 0x32 50
-/three % 0x33 51
-/four % 0x34 52
-/five % 0x35 53
-/six % 0x36 54
-/seven % 0x37 55
-/eight % 0x38 56
-/nine % 0x39 57
-/colon % 0x3A 58
-/semicolon % 0x3B 59
-/less % 0x3C 60 /exclamdown in Tex text
-/equal % 0x3D 61
-/greater % 0x3E 62 /questiondown in TeX text
-/question % 0x3F 63
-/at % 0x40 64
-/A % 0x41 65
-/B % 0x42 66
-/C % 0x43 67
-/D % 0x44 68
-/E % 0x45 69
-/F % 0x46 70
-/G % 0x47 71
-/H % 0x48 72
-/I % 0x49 73
-/J % 0x4A 74
-/K % 0x4B 75
-/L % 0x4C 76
-/M % 0x4D 77
-/N % 0x4E 78
-/O % 0x4F 79
-/P % 0x50 80
-/Q % 0x51 81
-/R % 0x52 82
-/S % 0x53 83
-/T % 0x54 84
-/U % 0x55 85
-/V % 0x56 86
-/W % 0x57 87
-/X % 0x58 88
-/Y % 0x59 89
-/Z % 0x5A 90
-/bracketleft % 0x5B 91
-/backslash % 0x5C 92 /quotedblleft in TeX text
-/bracketright % 0x5D 93
-/circumflex % 0x5E 94 /asciicircum in ASCII
-/underscore % 0x5F 95 /dotaccent in TeX text
-/quoteleft % 0x60 96 /grave accent in ANSI
-/a % 0x61 97
-/b % 0x62 98
-/c % 0x63 99
-/d % 0x64 100
-/e % 0x65 101
-/f % 0x66 102
-/g % 0x67 103
-/h % 0x68 104
-/i % 0x69 105
-/j % 0x6A 106
-/k % 0x6B 107
-/l % 0x6C 108
-/m % 0x6D 109
-/n % 0x6E 110
-/o % 0x6F 111
-/p % 0x70 112
-/q % 0x71 113
-/r % 0x72 114
-/s % 0x73 115
-/t % 0x74 116
-/u % 0x75 117
-/v % 0x76 118
-/w % 0x77 119
-/x % 0x78 120
-/y % 0x79 121
-/z % 0x7A 122
-/braceleft % 0x7B 123 /endash in TeX text
-/bar % 0x7C 124 /emdash in TeX test
-/braceright % 0x7D 125 /hungarumlaut in TeX text
-/tilde % 0x7E 126 /asciitilde in ASCII
-/dieresis % 0x7F 127 also at 168
-/Lslash % 0x80 128 position is unfortunate, but too late to fix
-/quotesingle % 0x81 129
-/quotesinglbase % 0x82 130
-/florin % 0x83 131
-/quotedblbase % 0x84 132
-/ellipsis % 0x85 133
-/dagger % 0x86 134
-/daggerdbl % 0x87 135
-/circumflex % 0x88 136
-/perthousand % 0x89 137
-/Scaron % 0x8A 138
-/guilsinglleft % 0x8B 139
-/OE % 0x8C 140
-/Zcaron % 0x8D 141
-/asciicircum % 0x8E 142
-/minus % 0x8F 143
-/lslash % 0x90 144
-/quoteleft % 0x91 145
-/quoteright % 0x92 146
-/quotedblleft % 0x93 147
-/quotedblright % 0x94 148
-/bullet % 0x95 149
-/endash % 0x96 150
-/emdash % 0x97 151
-/tilde % 0x98 152
-/trademark % 0x99 153
-/scaron % 0x9A 154
-/guilsinglright % 0x9B 155
-/oe % 0x9C 156
-/zcaron % 0x9D 157
-/asciitilde % 0x9E 158
-/Ydieresis % 0x9F 159
-/nbspace % 0xA0 160 no break space
-/exclamdown % 0xA1 161
-/cent % 0xA2 162
-/sterling % 0xA3 163
-/currency % 0xA4 164
-/yen % 0xA5 165
-/brokenbar % 0xA6 166
-/section % 0xA7 167
-/dieresis % 0xA8 168
-/copyright % 0xA9 169
-/ordfeminine % 0xAA 170
-/guillemotleft % 0xAB 171
-/logicalnot % 0xAC 172
-/sfthyphen % 0xAD 173 /hyphen (hanging hyphen)
-/registered % 0xAE 174
-/macron % 0xAF 175
-/degree % 0xB0 176
-/plusminus % 0xB1 177
-/twosuperior % 0xB2 178
-/threesuperior % 0xB3 179
-/acute % 0xB4 180
-/mu % 0xB5 181
-/paragraph % 0xB6 182
-/periodcentered % 0xB7 183
-/cedilla % 0xB8 184
-/onesuperior % 0xB9 185
-/ordmasculine % 0xBA 186
-/guillemotright % 0xBB 187
-/onequarter % 0xBC 188
-/onehalf % 0xBD 189
-/threequarters % 0xBE 190
-/questiondown % 0xBF 191
-/Agrave % 0xC0 192
-/Aacute % 0xC1 193
-/Acircumflex % 0xC2 194
-/Atilde % 0xC3 195
-/Adieresis % 0xC4 196
-/Aring % 0xC5 197
-/AE % 0xC6 198
-/Ccedilla % 0xC7 199
-/Egrave % 0xC8 200
-/Eacute % 0xC9 201
-/Ecircumflex % 0xCA 202
-/Edieresis % 0xCB 203
-/Igrave % 0xCC 204
-/Iacute % 0xCD 205
-/Icircumflex % 0xCE 206
-/Idieresis % 0xCF 207
-/Eth % 0xD0 208
-/Ntilde % 0xD1 209
-/Ograve % 0xD2 210
-/Oacute % 0xD3 211
-/Ocircumflex % 0xD4 212
-/Otilde % 0xD5 213
-/Odieresis % 0xD6 214
-/multiply % 0xD7 215 OE in T1
-/Oslash % 0xD8 216
-/Ugrave % 0xD9 217
-/Uacute % 0xDA 218
-/Ucircumflex % 0xDB 219
-/Udieresis % 0xDC 220
-/Yacute % 0xDD 221
-/Thorn % 0xDE 222
-/germandbls % 0xDF 223
-/agrave % 0xE0 224
-/aacute % 0xE1 225
-/acircumflex % 0xE2 226
-/atilde % 0xE3 227
-/adieresis % 0xE4 228
-/aring % 0xE5 229
-/ae % 0xE6 230
-/ccedilla % 0xE7 231
-/egrave % 0xE8 232
-/eacute % 0xE9 233
-/ecircumflex % 0xEA 234
-/edieresis % 0xEB 235
-/igrave % 0xEC 236
-/iacute % 0xED 237
-/icircumflex % 0xEE 238
-/idieresis % 0xEF 239
-/eth % 0xF0 240
-/ntilde % 0xF1 241
-/ograve % 0xF2 242
-/oacute % 0xF3 243
-/ocircumflex % 0xF4 244
-/otilde % 0xF5 245
-/odieresis % 0xF6 246
-/divide % 0xF7 247 oe in T1
-/oslash % 0xF8 248
-/ugrave % 0xF9 249
-/uacute % 0xFA 250
-/ucircumflex % 0xFB 251
-/udieresis % 0xFC 252
-/yacute % 0xFD 253
-/thorn % 0xFE 254
-/ydieresis % 0xFF 255 germandbls in T1
-] def
diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex
index 5ea3f981e88..7eddd5d1703 100644
--- a/Master/texmf-dist/tex/texinfo/texinfo.tex
+++ b/Master/texmf-dist/tex/texinfo/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2010-05-22.17}
+\def\texinfoversion{2010-06-10.11}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2064,8 +2064,9 @@ end
% @fonttextsize 10
% (or 11) to redefine the text font size. pt is assumed.
%
-\def\xword{10}
\def\xiword{11}
+\def\xword{10}
+\def\xwordpt{10pt}
%
\parseargdef\fonttextsize{%
\def\textsizearg{#1}%
@@ -2785,7 +2786,18 @@ end
\def\LaTeX{%
L\kern-.36em
{\setbox0=\hbox{T}%
- \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
+ \vbox to \ht0{\hbox{%
+ \ifx\textnominalsize\xwordpt
+ % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX.
+ % Revert to plain's \scriptsize, which is 7pt.
+ \count255=\the\fam $\fam\count255 \scriptstyle A$%
+ \else
+ % For 11pt, we can use our lllsize.
+ \selectfonts\lllsize A%
+ \fi
+ }%
+ \vss
+ }}%
\kern-.15em
\TeX
}