Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

1 files changed, 24 insertions, 5 deletions

diff --git a/source/ap/ghostscript/cidfmap b/source/ap/ghostscript/cidfmap
index 28d69ad88..ef18631f5 100644
--- a/source/ap/ghostscript/cidfmap
+++ b/source/ap/ghostscript/cidfmap
@@ -1,30 +1,49 @@
 %!
-% $Id: cidfmap 6300 2005-12-28 19:56:24Z giles $
 % 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 CIF font with another CID font :
+% 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 CIF font with a True Type font :
+% 2. A substutution of a CIDFont font with a True Type font :
 %
-%    /substituted << /FileType /TrueType /Path (path) /SunfontID 1 /CSI [(ordering) supplement] >> ;
+%    /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 :
 %
+% 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.
 %