Fixes suggested by Hironobu Yamashita.

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

4 files changed, 1 insertions, 395 deletions

diff --git a/Master/tlpkg/tlgs/Resource/Init/Fontmap b/Master/tlpkg/tlgs/Resource/Init/Fontmap
deleted file mode 100644
index ae5af96e0ee..00000000000
--- a/Master/tlpkg/tlgs/Resource/Init/Fontmap
+++ /dev/null
@@ -1,4 +0,0 @@
-%!
-% See Fontmap.GS for the syntax of real Fontmap files.
-%% Replace 1 (Fontmap.GS)
-(Fontmap.GS) .runlibfile
diff --git a/Master/tlpkg/tlgs/Resource/Init/Fontmap.GS b/Master/tlpkg/tlgs/Resource/Init/Fontmap.GS
deleted file mode 100644
index a9fa335a219..00000000000
--- a/Master/tlpkg/tlgs/Resource/Init/Fontmap.GS
+++ /dev/null
@@ -1,343 +0,0 @@
-% Copyright (C) 2001-2012 Artifex Software, Inc.
-% All Rights Reserved.
-%
-% This software is provided AS-IS with no warranty, either express or
-% implied.
-%
-% This software is distributed under license and may not be copied,
-% modified or distributed except as expressly authorized under the terms
-% of the license contained in the file LICENSE in this distribution.
-%
-% Refer to licensing information at http://www.artifex.com or contact
-% Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
-% CA  94903, U.S.A., +1(415)492-9861, for further information.
-%
-
-% Fontmap - standard font catalog for Ghostscript.
-
-% ----------------------------------------------------------------
-
-% This file is a catalog of fonts known to Ghostscript.  Any font
-% that is to be loaded automatically when named must be in this catalog,
-% except for fonts that Ghostscript finds automatically in directories
-% named in the GS_FONTPATH environment variable.
-
-% Each font has an entry consisting of three items:
-%
-%	- The name by which the font is known inside Ghostscript
-%	(a Ghostscript name preceded by a `/', or a string enclosed
-%	in parentheses).  This is used to find the file from which
-%	a font of a given name should be loaded.
-%
-%	- Information depending on whether this is a real font or a
-%	font alias:
-%
-%		- For real fonts, the name of the Ghostscript font
-%		file (a Ghostscript string, enclosed in parentheses).
-%		The filename should include the extension, which (by
-%		convention) is `.gsf'.  `.pfa' and `.pfb' files are
-%		also usable as fonts for Ghostscript.
-%
-%		- For font aliases, the name of the font which should
-%		be used when this one is requested, preceded by a
-%		`/'.  See the entry for Charter below for an example.
-%		Note that an alias name cannot be enclosed in parentheses.
-%
-%	- At least one space or tab, and a terminating semicolon.
-
-% The following table is executed as a PostScript file.
-% If you add new entries, be sure to copy the punctuation accurately;
-% in particular, you must leave at least one space or tab between each
-% field in the entry.  Also, please read fonts.doc for important information
-% about font names.
-
-% PDF interpreter evaluates hexadecimal escapes in PDF font names before
-% looking up the font. When the resulting name cannot be represented using
-% PostScript name syntax, the string can be used instead of the name.
-
-% Note that .pfa and .pfb fonts are compatible with Adobe Type Manager
-% and other programs that don't include full PostScript interpreters,
-% as well as with PostScript interpreters; .gsf fonts are compatible with
-% PostScript interpreters, but not with ATM or similar programs.
-
-% 
-%
-% Fonts contributed by:
-%	URW++ Design and Development Incorporated
-%	Poppenbuetteler Bogen 29A
-%	D-22399 Hamburg
-%	Germany
-%	tel. +49 (40) 60 60 50
-%	fax +49 (40) 60 60 51 11
-%	http://www.urwpp.de
-% for distribution under the GNU License and Aladdin Free Public License.
-% See the notice at the head of this Fontmap file for licensing terms.
-% Each of these fonts is individually covered by the license:
-% for licensing purposes, they are not "part of" any larger entity.
-% The following notice applies to these fonts:
-%
-%	Copyright URW Software, Copyright 1994 by URW.
-%
-
-% Aliases
-
-/AvantGarde-BookOblique		/URWGothic-BookOblique    ;
-/AvantGarde-Book		/URWGothic-Book        ;
-/AvantGarde-DemiOblique		/URWGothic-DemiOblique    ;
-/AvantGarde-Demi		/URWGothic-Demi        ;
-/Bookman-DemiItalic		/URWBookman-DemiItalic	;
-/Bookman-Demi			/URWBookman-Demi	;
-/Bookman-LightItalic		/URWBookman-LightItalic	;
-/Bookman-Light			/URWBookman-Light	;
-/Courier-Bold			/NimbusMonoPS-Bold	;
-/Courier-BoldOblique		/NimbusMonoPS-BoldItalic	;
-/Courier			/NimbusMonoPS-Regular	;
-/Courier-Oblique		/NimbusMonoPS-Italic	;
-/Helvetica-Bold			/NimbusSans-Bold ;
-/Helvetica-BoldOblique		/NimbusSans-BoldOblique      ;
-/Helvetica-Narrow-Bold		/NimbusSansNarrow-Bold    ;
-/Helvetica-Narrow-BoldOblique	/NimbusSansNarrow-BdOblique        ;
-/Helvetica-Narrow		/NimbusSansNarrow-Regular    ;
-/Helvetica-Narrow-Oblique	/NimbusSansNarrow-Oblique        ;
-/Helvetica			/NimbusSans-Regular ;
-/Helvetica-Oblique		/NimbusSans-Oblique      ;
-/NewCenturySchlbk-Bold		/C059-Bold	;
-/NewCenturySchlbk-BoldItalic	/C059-BdIta	;
-/NewCenturySchlbk-Italic	/C059-Italic	;
-/NewCenturySchlbk-Roman		/C059-Roman	;
-/Palatino-BoldItalic		/P052-BoldItalic	;
-/Palatino-Bold			/P052-Bold	;
-/Palatino-Italic		/P052-Italic	;
-/Palatino-Roman			/P052-Roman	;
-/Symbol				/StandardSymbolsPS	;
-/Times-BoldItalic		/NimbusRoman-BoldItalic	;
-/Times-Bold			/NimbusRoman-Bold	;
-/Times-Italic			/NimbusRoman-Italic	;
-/Times-Roman			/NimbusRoman-Regular	;
-/ZapfChancery-MediumItalic	/Z003-MediumItalic	;
-/ZapfDingbats			/D050000L	;
-
-% 
-%
-% Type 1 fonts contributed to the X11R5 distribution.
-%
-
-% The following notice accompanied the Charter fonts.
-%
-% (c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
-%
-% You are hereby granted permission under all Bitstream propriety rights
-% to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
-% Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
-% for any purpose and without restriction; provided, that this notice is
-% left intact on all copies of such fonts and that Bitstream's trademark
-% is acknowledged as shown below on all unmodified copies of the 4 Charter
-% Type 1 fonts.
-%
-% BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
-
-/CharterBT-Roman		(bchr.pfa)	;
-/CharterBT-Italic		(bchri.pfa)	;
-/CharterBT-Bold			(bchb.pfa)	;
-/CharterBT-BoldItalic		(bchbi.pfa)	;
-
-% Aliases
-
-/Charter-Roman			/CharterBT-Roman	;
-/Charter-Italic			/CharterBT-Italic	;
-/Charter-Bold			/CharterBT-Bold		;
-/Charter-BoldItalic		/CharterBT-BoldItalic	;
-
-% The following notice accompanied the Utopia font:
-%
-%   Permission to use, reproduce, display and distribute the listed
-%   typefaces is hereby granted, provided that the Adobe Copyright notice
-%   appears in all whole and partial copies of the software and that the
-%   following trademark symbol and attribution appear in all unmodified
-%   copies of the software:
-%
-%           Copyright (c) 1989 Adobe Systems Incorporated
-%           Utopia (R)
-%           Utopia is a registered trademark of Adobe Systems Incorporated
-%
-%   The Adobe typefaces (Type 1 font program, bitmaps and Adobe Font
-%   Metric files) donated are:
-%
-%           Utopia Regular
-%           Utopia Italic
-%           Utopia Bold
-%           Utopia Bold Italic
-
-/Utopia-Regular		(putr.pfa)	;
-/Utopia-Italic		(putri.pfa)	;
-/Utopia-Bold		(putb.pfa)	;
-/Utopia-BoldItalic	(putbi.pfa)	;
-
-% 
-%
-% Fonts contributed by URW GmbH for distribution under the GNU License.
-% The following notice accompanied these fonts:
-%
-% U004006T URW Grotesk 2031 Bold PostScript Type 1 Font Program
-% U003043T URW Antiqua 2051 Regular Condensed PostScript Type 1 Font Program
-%
-% Copyright (c) 1992 URW GmbH, Hamburg, Germany
-%
-% This program is free software; you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
-% (at your option) later version.
-%
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; wihtout even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-% See the GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 U.S.A.
-%
-% Address:
-% URW GmbH
-% PC Support
-% Harksheider Strasse 102
-% 2000 Hamburg 65
-% Germany
-% Phone: +49 40 60 60 50       (Reception)
-% Phone: +49 40 60 60 52 30   (PC Support)
-% Fax    : +49 40 60 60 52 52
-%
-
-/URWAntiquaT-RegularCondensed	(u003043t.gsf)	;
-/URWGroteskT-Bold		(u004006t.gsf)	;
-
-% 
-%
-% Calligraphic Kana fonts.  These are distributed under the OFL 1.1:
-%
-% Copyright (c) 1993, Kevin Hartig (kevin.hartig@gmail.com),
-% with Reserved Font Name Calligraphic-Hiragana and Calligraphic-Katakana.
-% This Font Software is licensed under the SIL Open Font License, Version 1.1.
-% This license is available with an FAQ at:  http://scripts.sil.org/OFL
-
-% Hiragana and Katakana fonts.  The character names are inappropriate,
-% and the encoding is probably not related to any known standard.
-
-/Calligraphic-Hiragana		(fhirw.gsf)	;
-/Calligraphic-Katakana		(fkarw.gsf)	;
-
-% 
-%
-% Public-domain fonts.  These have no copyright, and are of unknown quality.
-
-% Cyrillic fonts.  The character names are inappropriate,
-% and the encoding is probably not related to any known standard.
-
-/Shareware-Cyrillic-Regular	(fcyr.gsf)	;
-/Shareware-Cyrillic-Italic	(fcyri.gsf)	;
-
-% Aliases
-/Cyrillic			/Cyrillic-Regular	;
-/Cyrillic-Regular		/Shareware-Cyrillic-Regular	;
-/Cyrillic-Italic		/Shareware-Cyrillic-Italic	;
-
-% 
-%
-% Fonts converted from Hershey outlines.  These are constructed and
-% maintained manually.  These are also in the public domain.
-%
-% The suggested UniqueID's and filenames are constructed differently for
-% these than for the ones above, because of the strange way that the Hershey
-% fonts were constructed.  The scheme for these looks like:
-%
-% 42TTXY0
-%
-% TT = typeface, X = ``class'', Y = variation
-%
-% The typeface names and numbers are listed in fonts.mak.
-%
-% class:
-% 0 = normal			= r
-% 1 = simplex			= s
-% 2 = complex			= c
-% 3 = triplex			= t
-% 4 = duplex			= d
-%
-% variation:
-% 0 = normal			(omitted)
-% 1 = oblique			= o
-% 2 = italic			= i
-% 3 = bold			= b
-% 4 = bold oblique		= bo
-% 5 = bold italic		= bi
-%
-
-% Fonts created by Thomas Wolff <wolff@inf.fu-berlin.de>, by adding
-% accents, accented characters, and various other non-alphabetics
-% to the original Hershey fonts.  These are "freeware", not to be sold.
-
-/Hershey-Gothic-English		(hrger.pfa)	;	% 5066533
-/Hershey-Gothic-German		(hrgrr.pfa)	;
-/Hershey-Gothic-Italian		(hritr.pfa)	; 
-
-/Hershey-Plain-Duplex		(hrpld.pfa)	;
-/Hershey-Plain-Duplex-Italic	(hrpldi.pfa)	;
-/Hershey-Plain-Triplex		(hrplt.pfa)	;
-/Hershey-Plain-Triplex-Italic	(hrplti.pfa)	;
-
-/Hershey-Script-Complex		(hrscc.pfa)	;
-/Hershey-Script-Simplex		(hrscs.pfa)	;	% 5066541
-
-% Fonts created algorithmically from the above.
-
-/Hershey-Gothic-English-Bold		(hrgerb.gsf)	;	% 5066542
-/Hershey-Gothic-English-Oblique		(hrgero.gsf)	;
-/Hershey-Gothic-English-SemiBold	(hrgerd.gsf)	;
-/Hershey-Gothic-German-Bold		(hrgrrb.gsf)	;
-/Hershey-Gothic-German-Oblique		(hrgrro.gsf)	;
-/Hershey-Gothic-Italian-Bold		(hritrb.gsf)	;
-/Hershey-Gothic-Italian-Oblique		(hritro.gsf)	;
-
-/Hershey-Plain-Duplex-Bold		(hrpldb.gsf)	;
-/Hershey-Plain-Duplex-Bold-Italic	(hrpldbi.gsf)	;
-/Hershey-Plain-Triplex-Bold		(hrpltb.gsf)	;
-/Hershey-Plain-Triplex-Bold-Italic	(hrpltbi.gsf)	;
-
-/Hershey-Script-Complex-Bold		(hrsccb.gsf)	;
-/Hershey-Script-Complex-Oblique		(hrscco.gsf)	;
-/Hershey-Script-Simplex-Bold		(hrscsb.gsf)	;
-/Hershey-Script-Simplex-Oblique		(hrscso.gsf)	;	% 5066556
-
-% Fonts consisting only of characters from the original Hershey
-% distribution.  These are Type 3 fonts.
-
-/Hershey-Greek-Complex			(hrgkc.gsf)	;	% 5066557
-/Hershey-Greek-Simplex			(hrgks.gsf)	;
-
-/Hershey-Plain				(hrplr.gsf)	;
-/Hershey-Plain-Simplex			(hrpls.gsf)	;	% 5066560
-
-% Fonts created algorithmically from the above.
-
-/Hershey-Plain-Bold			(hrplrb.gsf)	;	% 5066561
-/Hershey-Plain-Bold-Oblique		(hrplrbo.gsf)	;
-/Hershey-Plain-Oblique			(hrplro.gsf)	;
-/Hershey-Plain-Simplex-Bold		(hrplsb.gsf)	;
-/Hershey-Plain-Simplex-Bold-Oblique	(hrplsbo.gsf)	;
-/Hershey-Plain-Simplex-Oblique		(hrplso.gsf)	;	% 5066566
-
-% This font, and only this font among the Hershey fonts, uses
-% the SymbolEncoding.
-
-/Hershey-Symbol				(hrsyr.gsf)	;	% 5066567
-
-/Arial					/ArialMT		;
-/Arial,Bold				/Arial-BoldMT		;
-/Arial,Italic				/Arial-ItalicMT		;
-/Arial,BoldItalic			/Arial-BoldItalicMT	;
-
-/TimesNewRoman				/TimesNewRomanPSMT		;
-/TimesNewRoman,Bold			/TimesNewRomanPS-BoldMT		;
-/TimesNewRoman,Italic			/TimesNewRomanPS-ItalicMT	;
-/TimesNewRoman,BoldItalic		/TimesNewRomanPS-BoldItalicMT	;
-
diff --git a/Master/tlpkg/tlgs/Resource/Init/cidfmap b/Master/tlpkg/tlgs/Resource/Init/cidfmap
deleted file mode 100644
index bed221ac0db..00000000000
--- a/Master/tlpkg/tlgs/Resource/Init/cidfmap
+++ /dev/null
@@ -1,47 +0,0 @@
-%!
-% This is a sample map file for CIDFont category.
-
-%
-% The map is a set of records, which must use one of the two formats :
-%
-% 1. A substutution of a CIDFont font with another CIDFont :
-%
-%    /substituted /original ;
-%
-%    Where 'substituted' is a name being used in a document,
-%    'original' is a name of an available resource.
-%
-% 2. A substutution of a CIDFont font with a True Type font :
-%
-%    /substituted << /FileType /TrueType /Path (path) /SubfontID 1 /CSI [(ordering) supplement] >> ;
-%
-%    Where 'substituted' is a name being used in a document,
-%    'path' is a path to a True Type font file,
-%    'ordering' is a value of Ordering required for CIDSystemInfo dictionary,
-%    'supplement' is a value of Supplement required for CIDSystemInfo dictionary.
-%    'SubfontID' is the index of the desired font in a TTC - ignored if the target is not a TTC.
-%
-%    The Ordering, and Registry (if present) entries should be PostScript string types
-%    ie enclosed in parentheses, not PostScript name type (initial character '/'). See
-%    gs/doc/Use.htm#CIDFontSubstitution
-%
-%    Alternatively:
-%    (substituted name) << /FileType /TrueType /Path (path) /SubfontID 1 /CSI [(ordering) supplement] >> ;
-%
-%    This is where the CIDFont name in the document contains a space character. Using a string instead of a name
-%    allows this work - Ghostscript will internally convert the key string with a space to a name.
-%
-%
-% Examples :
-%    
-%   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
-%   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
-%   /Ryumin-Medium << /FileType /TrueType /Path (windir) getenv not {(c:/windows)}if (/Fonts/BATANG.TTC)concatstrings /SubfontID 3 /CSI [(Japan1) 2] >> ;
-%
-%   NOTE: getenv returns a boolean to indicate success of or failure, as well as the value on success. In the example, it uses this
-%         to include a default value should getenv fail.
-%
-%  (Century Gothic) << /FileType /TrueType /Path (/usr/share/fonts/truetype/fonts-japanese-gothic.ttf) /CSI [(Identity) 1] >> ;
-%
-%  Note the use of a string to cope with the name containing a space.
-%
diff --git a/Master/tlpkg/tlgs/lib/cidfmap b/Master/tlpkg/tlgs/lib/cidfmap
index 3c93ac59718..7eae7d1d519 100644
--- a/Master/tlpkg/tlgs/lib/cidfmap
+++ b/Master/tlpkg/tlgs/lib/cidfmap
@@ -6,4 +6,4 @@
 
 (cidfmap.TeXLive) .runlibfile
 
-%EOF
\ No newline at end of file
+%EOF