saving uncommitted changes in /etc prior to emerge run

diff --git a/ImageMagick-6/coder.xml b/ImageMagick-6/coder.xml
index 5c62cb46459843d5c22493a1063de4db6c435f69..4d2394febf2977b0606a302354c9a135cc534245 100644 (file)
--- a/ImageMagick-6/coder.xml
+++ b/ImageMagick-6/coder.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE codermap [
-<!ELEMENT codermap (coder)*>
-<!ELEMENT coder (#PCDATA)>
-<!ATTLIST coder magick CDATA #REQUIRED>
-<!ATTLIST coder name CDATA #REQUIRED>
+<!ELEMENT codermap (coder)+>
+  <!ATTLIST codermap xmlns CDATA #FIXED ''>
+  <!ELEMENT coder EMPTY>
+  <!ATTLIST coder xmlns CDATA #FIXED '' magick NMTOKEN #REQUIRED
+    name NMTOKEN #REQUIRED>
 ]>
 <!--
   Associate an image format with the specified coder module.

diff --git a/ImageMagick-6/delegates.xml b/ImageMagick-6/delegates.xml
index 35742a4c53ef256f03e6c7a1e09d4740412abb3d..f2696f4ed66b8e30febe46feb6f464b1b7d68b68 100644 (file)
--- a/ImageMagick-6/delegates.xml
+++ b/ImageMagick-6/delegates.xml
@@ -1,13 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE delegatemap [
-<!ELEMENT delegatemap (delegate)+>
-<!ELEMENT delegate (#PCDATA)>
-<!ATTLIST delegate decode CDATA #IMPLIED>
-<!ATTLIST delegate encode CDATA #IMPLIED>
-<!ATTLIST delegate mode CDATA #IMPLIED>
-<!ATTLIST delegate spawn CDATA #IMPLIED>
-<!ATTLIST delegate stealth CDATA #IMPLIED>
-<!ATTLIST delegate thread-support CDATA #IMPLIED>
-<!ATTLIST delegate command CDATA #REQUIRED>
+  <!ELEMENT delegatemap (delegate)+>
+  <!ATTLIST delegatemap xmlns CDATA #FIXED ''>
+  <!ELEMENT delegate EMPTY>
+  <!ATTLIST delegate xmlns CDATA #FIXED '' command CDATA #REQUIRED
+    decode NMTOKEN #IMPLIED encode NMTOKEN #IMPLIED mode NMTOKEN #IMPLIED
+    spawn NMTOKEN #IMPLIED stealth NMTOKEN #IMPLIED>
 ]>
 <!--
   Delegate command file.
@@ -61,15 +59,15 @@
 -->
 <delegatemap>
   <delegate decode="bpg" command="&quot;bpgdec&quot; -b 16 -o &quot;%o.png&quot; &quot;%i&quot;; /bin/mv &quot;%o.png&quot; &quot;%o&quot;"/>
-  <delegate decode="png" encode="bpg" command="&quot;bpgenc&quot; -b 12 -sstdout=%%stderr &quot;%Q&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="png" encode="bpg" command="&quot;bpgenc&quot; -b 12 -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="blender" command="&quot;blender&quot; -b &quot;%i&quot; -F PNG -o &quot;%o&quot;&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
   <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/; /bin/rm &quot;%i&quot;"/>
   <delegate decode="cdr" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
   <delegate decode="cgm" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
   <delegate decode="https" command="&quot;curl&quot; -s -k -L -o &quot;%o&quot; &quot;https:%M&quot;"/>
-  <delegate decode="dng:decode" command="&quot;ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
   <delegate decode="doc" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
   <delegate decode="docx" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="dng:decode" command="&quot;ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
   <delegate decode="dot" command='&quot;dot&quot; -Tsvg &quot;%i&quot; -o &quot;%o&quot;' />
   <delegate decode="dvi" command="&quot;dvips&quot; -sstdout=%%stderr -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="dxf" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
@@ -83,7 +81,7 @@
   <delegate decode="html" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="ilbm" command="&quot;ilbmtoppm&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="jpg" encode="lep" mode="encode" command="&quot;lepton&quot; &quot;%i&quot; &quot;%o&quot;"/>
-  <delegate decode="jxr" command="/bin/mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;JxrDecApp&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot; -c 0; /bin/mv &quot;%i.jxr&quot; &quot;%i&quot;; /bin/mv &quot;%o.bmp&quot; &quot;%o&quot;"/>
+  <delegate decode="jxr" command="/bin/mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;JxrDecApp&quot; -i &quot;%i.jxr&quot; -o &quot;%o.pnm&quot;; /bin/mv &quot;%i.jxr&quot; &quot;%i&quot;; /bin/mv &quot;%o.pnm&quot; &quot;%o&quot;"/>
   <delegate decode="lep" mode="decode" command="&quot;lepton&quot; &quot;%i&quot; &quot;%o&quot;"/>
   <delegate decode="miff" encode="show" spawn="True" command="&quot;display&quot; -immutable -delay 0 -title &quot;%M&quot; &quot;%i&quot;"/>
   <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;display&quot; -immutable -delay 0 -title &quot;%M&quot; &quot;%i&quot;"/>
@@ -92,7 +90,7 @@
   <delegate decode="pcl:cmyk" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pamcmyk32&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pcl:color" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
   <delegate decode="pcl:mono" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
-  <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=eps2write&quot; -sPDFPassword=&quot;%a&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 -sPDFPassword=&quot;%a&quot; &quot;-sDEVICE=eps2write&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="pdf" encode="ps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ps2write&quot; -sPDFPassword=&quot;%a&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="png" encode="webp" command="&quot;cwebp&quot; -quiet %Q &quot;%i&quot; -o &quot;%o&quot;"/>
   <delegate decode="pnm" encode="ilbm" mode="encode" command="&quot;ppmtoilbm&quot; -24if &quot;%i&quot; &gt; &quot;%o&quot;"/>

diff --git a/ImageMagick-6/log.xml b/ImageMagick-6/log.xml
index cdacdab8436d6c2f87d96839ee56641b1e8e06e9..8a290992a4a1ad8604d29eeb1716ff0591bf9e9a 100644 (file)
--- a/ImageMagick-6/log.xml
+++ b/ImageMagick-6/log.xml
@@ -10,6 +10,45 @@
 <!ATTLIST log format CDATA #IMPLIED>
 ]>
 <!--
+  Configure ImageMagick logger.
+
+  Choose from one or more these events separated by a comma:
+    all
+    accelerate
+    annotate
+    blob
+    cache
+    coder
+    command
+    configure
+    deprecate
+    draw
+    exception
+    locale
+    module
+    none
+    pixel
+    policy
+    resource
+    trace
+    transform
+    user
+    wand
+    x11
+
+  Choose one output handler:
+    console
+    debug
+    event
+    file
+    none
+    stderr
+    stdout
+
+  When output is to a file, specify the filename.  Embed %g in the filename to
+  support log generations.  Generations is the number of log files to retain.
+  Limit is the number of logging events before generating a new log generation.
+
   The format of the log is defined by embedding special format characters:
 
     %c   client
@@ -29,6 +68,7 @@
     %%   percent sign
     \n   newline
     \r   carriage return
+    xml
 -->
 <logmap>
   <log events="None"/>

diff --git a/ImageMagick-6/mime.xml b/ImageMagick-6/mime.xml
index c1b61f47deb690c0ea27003693c4a28f16543daa..9530fc8d06ea46ac19f13a13a9ceb3c48cb6c7f2 100644 (file)
--- a/ImageMagick-6/mime.xml
+++ b/ImageMagick-6/mime.xml
@@ -13,6 +13,9 @@
   <!ATTLIST mime mask CDATA #IMPLIED>
   <!ATTLIST mime priority CDATA #IMPLIED>
 ]>
+<!--
+  Configure ImageMagick mime types.
+-->
 <mimemap>
   <mime type="application/andrew-inset" acronym="ATK" description="Andrew Toolkit" priority="100" pattern="*.ez" />
   <mime type="application/illustrator" description="Adobe Illustrator document" priority="100" pattern="*.ai" />

diff --git a/ImageMagick-6/policy.xml b/ImageMagick-6/policy.xml
index e295f80f6ef6ce61b7553d953bc4cabc1a7c9624..6330084a5ab033ddb328f6fee150a618d040c245 100644 (file)
--- a/ImageMagick-6/policy.xml
+++ b/ImageMagick-6/policy.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE policymap [
-<!ELEMENT policymap (policy)+>
-<!ELEMENT policy (#PCDATA)>
-<!ATTLIST policy domain (cache|delegate|coder|path|resource|system) #IMPLIED>
-<!ATTLIST policy name CDATA #IMPLIED>
-<!ATTLIST policy rights CDATA #IMPLIED>
-<!ATTLIST policy stealth CDATA #IMPLIED>
-<!ATTLIST policy cache CDATA #IMPLIED>
-<!ATTLIST policy coder CDATA #IMPLIED>
-<!ATTLIST policy delegate CDATA #IMPLIED>
-<!ATTLIST policy pattern CDATA #IMPLIED>
-<!ATTLIST policy path CDATA #IMPLIED>
-<!ATTLIST policy system CDATA #IMPLIED>
-<!ATTLIST policy value CDATA #IMPLIED>
+  <!ELEMENT policymap (policy)+>
+  <!ATTLIST policymap xmlns CDATA #FIXED ''>
+  <!ELEMENT policy EMPTY>
+  <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+    name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+    stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
 ]>
 <!--
   Configure ImageMagick policies.
@@ -38,18 +31,18 @@
 
   The /repository file system is restricted to read only.  We use a glob
   expression to match all paths that start with /repository:
-  
+
     <policy domain="path" rights="read" pattern="/repository/*" />
 
-  Let's prevent possible exploits by removing the right to use indirect reads.
+  Lets prevent users from executing any image filters:
 
-    <policy domain="path" rights="none" pattern="@*" />
+    <policy domain="filter" rights="none" pattern="*" />
 
   Any large image is cached to disk rather than memory:
 
     <policy domain="resource" name="area" value="1GP"/>
 
-  Define arguments for the memory, map, area, width, height, and disk resources
+  Define arguments for the memory, map, area, width, height and disk resources
   with SI prefixes (.e.g 100MB).  In addition, resource policies are maximums
   for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
   exceeds policy maximum so memory limit is 1GB).
@@ -65,6 +58,7 @@
   <!-- <policy domain="system" name="shred" value="2"/> -->
   <!-- <policy domain="system" name="precision" value="6"/> -->
   <!-- <policy domain="system" name="memory-map" value="anonymous"/> -->
+  <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
   <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
   <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
   <!-- <policy domain="resource" name="map" value="4GiB"/> -->
@@ -78,8 +72,8 @@
   <!-- <policy domain="resource" name="time" value="3600"/> -->
   <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
-  <!-- <policy domain="path" rights="none" pattern="@*"/>  -->
+  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
   <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
   <!-- <policy domain="cache" name="synchronize" value="True"/> -->
-  <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
+  <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
 </policymap>

diff --git a/ImageMagick-6/quantization-table.xml b/ImageMagick-6/quantization-table.xml
index a05552bb75e83f1c5f2caef14baea65a173ec822..fb718749a257de22cfc80decbe5ce10e8de239f1 100644 (file)
--- a/ImageMagick-6/quantization-table.xml
+++ b/ImageMagick-6/quantization-table.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE quantization-tables [
-<!ELEMENT quantization-tables (table)+>
-<!ELEMENT table (description , levels)>
-<!ELEMENT description (CDATA)>
-<!ELEMENT levels (CDATA)>
-<!ATTLIST table slot ID #REQUIRED>
-<!ATTLIST levels width CDATA #REQUIRED>
-<!ATTLIST levels height CDATA #REQUIRED>
-<!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ELEMENT quantization-tables (table)>
+  <!ATTLIST quantization-tables xmlns CDATA #FIXED "">
+  <!ELEMENT table (description , levels)>
+  <!ATTLIST table xmlns CDATA #FIXED "">
+  <!ATTLIST table alias NMTOKEN #REQUIRED>
+  <!ATTLIST table slot CDATA #REQUIRED>
+  <!ELEMENT description (#PCDATA)>
+  <!ATTLIST description xmlns CDATA #FIXED "">
+  <!ELEMENT levels (#PCDATA)>
+  <!ATTLIST levels xmlns CDATA #FIXED "">
+  <!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ATTLIST levels height CDATA #REQUIRED>
+  <!ATTLIST levels width CDATA #REQUIRED>
 ]>
 <!--
   JPEG quantization table created by Dr. Nicolas Robidoux, Senior Research
@@ -47,16 +52,17 @@
       85,  75,  135, 156, 189, 238, 311, 418
     </levels>
   </table>
-<!--
-  If you want to use a different quantization table for Chroma (say), just add 
+  <!--
+    If you want to use a different quantization table for Chroma, for example,
+    just add:
 
-  <table slot="1" alias="chroma">
-    <description>Chroma Quantization Table</description>
-    INSERT 64 POSITIVE INTEGERS HERE, COMMA-SEPARATED
-    </levels>
-  </table>
+    <table slot="1" alias="chroma">
+      <description>Chroma Quantization Table</description>
+      INSERT 64 POSITIVE INTEGERS HERE, COMMA-SEPARATED
+      </levels>
+    </table>
 
-  here (but outside of these comments).
--->
+    here (but outside of these comments).
+  -->
 </quantization-tables>
 

diff --git a/ImageMagick-6/thresholds.xml b/ImageMagick-6/thresholds.xml
index 2ca2daba2d408b46be45d829507aebb59ce99540..02b96a85af5238aa86c023ad1821d435b29917e1 100644 (file)
--- a/ImageMagick-6/thresholds.xml
+++ b/ImageMagick-6/thresholds.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE thresholds [
-<!ELEMENT thresholds (threshold)+>
-<!ELEMENT threshold (description , levels)>
-<!ELEMENT description (CDATA)>
-<!ELEMENT levels (CDATA)>
-<!ATTLIST threshold map ID #REQUIRED>
-<!ATTLIST levels width CDATA #REQUIRED>
-<!ATTLIST levels height CDATA #REQUIRED>
-<!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ELEMENT thresholds (threshold)+>
+  <!ATTLIST thresholds xmlns CDATA #FIXED ''>
+  <!ELEMENT threshold (description,levels)>
+  <!ATTLIST threshold xmlns CDATA #FIXED '' alias NMTOKEN #IMPLIED
+    map NMTOKEN #REQUIRED>
+  <!ELEMENT description (#PCDATA)>
+  <!ATTLIST description xmlns CDATA #FIXED ''>
+  <!ELEMENT levels (#PCDATA)>
+  <!ATTLIST levels xmlns CDATA #FIXED '' divisor CDATA #REQUIRED
+    height CDATA #REQUIRED width CDATA #REQUIRED>
 ]>
 <!--
   Threshold Maps for Ordered Posterized Dither

diff --git a/ImageMagick-6/type-apple.xml b/ImageMagick-6/type-apple.xml
index 08fc0c499baef6a526707dd679bb518ce7fc6971..57fe9d142eddce0636995e6be2b9a5c1af4c9907 100644 (file)
--- a/ImageMagick-6/type-apple.xml
+++ b/ImageMagick-6/type-apple.xml
@@ -1,1371 +1,1367 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick Apple font configuration.
+-->
 <typemap>
   <type
      format="ttf"
      name="AlBayan"
      fullname="Al Bayan Plain"
      family="Al Bayan"
-     glyphs="AlBayan.ttf"
+     glyphs="/AlBayan.ttf"
      />
   <type
      format="ttf"
      name="AlBayanB"
      fullname="Al Bayan Bold"
      family="Al Bayan"
-     glyphs="AlBayanBold.ttf"
+     glyphs="/AlBayanBold.ttf"
      />
   <type
      format="ttf"
      name="AndaleMono"
      fullname="Andale Mono"
      family="Andale Mono"
-     glyphs="Andale Mono.ttf"
+     glyphs="/Andale Mono.ttf"
      />
   <type
      format="ttf"
      name="AppleChancery"
      fullname="Apple Chancery"
      family="Apple Chancery"
-     glyphs="Apple Chancery.ttf"
+     glyphs="/Apple Chancery.ttf"
      />
   <type
      format="ttf"
      name="AppleLiGothicM"
      fullname="Apple LiGothic Medium"
      family="Apple LiGothic"
-     glyphs="Apple LiGothic Medium.ttf"
+     glyphs="/Apple LiGothic Medium.ttf"
      />
   <type
      format="ttf"
      name="AppleLiSungL"
      fullname="Apple LiSung Light"
      family="Apple LiSung"
-     glyphs="Apple LiSung Light.ttf"
+     glyphs="/Apple LiSung Light.ttf"
      />
   <type
      format="ttf"
      name="AppleMyungjo"
      fullname="AppleMyungjo Regular"
      family="AppleMyungjo"
-     glyphs="AppleMyungjo.ttf"
+     glyphs="/AppleMyungjo.ttf"
      />
   <type
      format="ttf"
      name="ArialBk"
      fullname="Arial Black"
      family="Arial Black"
-     glyphs="Arial Black.ttf"
+     glyphs="/Arial Black.ttf"
      />
   <type
      format="ttf"
      name="ArialBI"
      fullname="Arial Bold Italic"
      family="Arial"
-     glyphs="Arial Bold Italic.ttf"
+     glyphs="/Arial Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="ArialB"
      fullname="Arial Bold"
      family="Arial"
-     glyphs="Arial Bold.ttf"
+     glyphs="/Arial Bold.ttf"
      />
   <type
      format="ttf"
      name="ArialI"
      fullname="Arial Italic"
      family="Arial"
-     glyphs="Arial Italic.ttf"
+     glyphs="/Arial Italic.ttf"
      />
   <type
      format="ttf"
      name="ArialNarrowBI"
      fullname="Arial Narrow Bold Italic"
      family="Arial Narrow"
-     glyphs="Arial Narrow Bold Italic.ttf"
+     glyphs="/Arial Narrow Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="ArialNarrowB"
      fullname="Arial Narrow Bold"
      family="Arial Narrow"
-     glyphs="Arial Narrow Bold.ttf"
+     glyphs="/Arial Narrow Bold.ttf"
      />
   <type
      format="ttf"
      name="ArialNarrowI"
      fullname="Arial Narrow Italic"
      family="Arial Narrow"
-     glyphs="Arial Narrow Italic.ttf"
+     glyphs="/Arial Narrow Italic.ttf"
      />
   <type
      format="ttf"
      name="ArialNarrow"
      fullname="Arial Narrow"
      family="Arial Narrow"
-     glyphs="Arial Narrow.ttf"
+     glyphs="/Arial Narrow.ttf"
      />
   <type
      format="ttf"
      name="ArialRoundedB"
      fullname="Arial Rounded MT Bold"
      family="Arial Rounded Bold"
-     glyphs="Arial Rounded Bold.ttf"
+     glyphs="/Arial Rounded Bold.ttf"
      />
   <type
      format="ttf"
      name="ArialUnicode"
      fullname="Arial Unicode MS"
      family="Arial Unicode"
-     glyphs="Arial Unicode.ttf"
+     glyphs="/Arial Unicode.ttf"
      />
   <type
      format="ttf"
      name="Arial"
      fullname="Arial"
      family="Arial"
-     glyphs="Arial.ttf"
+     glyphs="/Arial.ttf"
      />
   <type
      format="ttf"
      name="ArialHebrew"
      fullname="Arial Hebrew"
      family="Arial Hebrew"
-     glyphs="ArialHB.ttf"
+     glyphs="/ArialHB.ttf"
      />
   <type
      format="ttf"
      name="ArialHebrewB"
      fullname="Arial Hebrew Bold"
      family="Arial Hebrew"
-     glyphs="ArialHBBold.ttf"
+     glyphs="/ArialHBBold.ttf"
      />
   <type
      format="ttf"
      name="AsapB"
      fullname="Asap Bold"
      family="Asap"
-     glyphs="Asap-Bold.ttf"
+     glyphs="/Asap-Bold.ttf"
      />
   <type
      format="ttf"
      name="AsapBI"
      fullname="Asap Bold Italic"
      family="Asap"
-     glyphs="Asap-BoldItalic.ttf"
+     glyphs="/Asap-BoldItalic.ttf"
      />
   <type
      format="ttf"
      name="AsapI"
      fullname="Asap Italic"
      family="Asap"
-     glyphs="Asap-Italic.ttf"
+     glyphs="/Asap-Italic.ttf"
      />
   <type
      format="ttf"
      name="Asap"
      fullname="Asap"
      family="Asap"
-     glyphs="Asap-Regular.ttf"
+     glyphs="/Asap-Regular.ttf"
      />
   <type
      format="ttf"
      name="AvantGardeDemi"
      fullname="Avant Garde Demi BT"
      family="AvantGarde Bk BT"
-     glyphs="Avant Garde Demi.ttf"
+     glyphs="/Avant Garde Demi.ttf"
      />
   <type
      format="ttf"
      name="Ayuthaya"
      fullname="Ayuthaya"
      family="Ayuthaya"
-     glyphs="Ayuthaya.ttf"
+     glyphs="/Ayuthaya.ttf"
      />
   <type
      format="ttf"
      name="Baghdad"
      fullname="Baghdad"
      family="Baghdad"
-     glyphs="Baghdad.ttf"
+     glyphs="/Baghdad.ttf"
      />
   <type
      format="ttf"
      name="BiauKai"
      fullname="BiauKai"
      family="BiauKai"
-     glyphs="BiauKai.ttf"
+     glyphs="/BiauKai.ttf"
      />
   <type
      format="ttf"
      name="BigCaslonM"
      fullname="Big Caslon Medium"
      family="Big Caslon"
-     glyphs="BigCaslon.ttf"
+     glyphs="/BigCaslon.ttf"
      />
   <type
      format="ttf"
      name="BrushScriptI"
      fullname="Brush Script MT Italic"
      family="Brush Script "
-     glyphs="Brush Script.ttf"
+     glyphs="/Brush Script.ttf"
      />
   <type
      format="ttf"
      name="Candice"
      fullname="Candice"
      family="Candice"
-     glyphs="Candice.ttf"
+     glyphs="/Candice.ttf"
      />
   <type
      format="ttf"
      name="Chalkduster"
      fullname="Chalkduster"
      family="Chalkduster"
-     glyphs="Chalkduster.ttf"
+     glyphs="/Chalkduster.ttf"
      />
   <type
      format="ttf"
      name="ComicSansMSB"
      fullname="Comic Sans MS Bold"
      family="Comic Sans"
-     glyphs="Comic Sans MS Bold.ttf"
+     glyphs="/Comic Sans MS Bold.ttf"
      />
   <type
      format="ttf"
      name="ComicSans"
      fullname="Comic Sans MS"
      family="Comic Sans"
-     glyphs="Comic Sans MS.ttf"
+     glyphs="/Comic Sans MS.ttf"
      />
   <type
      format="ttf"
      name="ComicSans"
      fullname="Comic Sans MS"
      family="Comic Sans"
-     glyphs="comic.ttf"
+     glyphs="/comic.ttf"
      />
   <type
      format="ttf"
      name="ComicSansMSB"
      fullname="Comic Sans MS Bold"
      family="Comic Sans"
-     glyphs="comicbd.ttf"
+     glyphs="/comicbd.ttf"
      />
   <type
      format="ttf"
      name="CorsivaHebrew"
      fullname="Corsiva Hebrew"
      family="Corsiva Hebrew"
-     glyphs="Corsiva.ttf"
+     glyphs="/Corsiva.ttf"
      />
   <type
      format="ttf"
      name="CorsivaHebrewB"
      fullname="Corsiva Hebrew Bold"
      family="Corsiva Hebrew"
-     glyphs="CorsivaBold.ttf"
+     glyphs="/CorsivaBold.ttf"
      />
   <type
      format="ttf"
      name="CourierNewBI"
      fullname="Courier New Bold Italic"
      family="Courier New"
-     glyphs="Courier New Bold Italic.ttf"
+     glyphs="/Courier New Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="CourierNewB"
      fullname="Courier New Bold"
      family="Courier New"
-     glyphs="Courier New Bold.ttf"
+     glyphs="/Courier New Bold.ttf"
      />
   <type
      format="ttf"
      name="CourierNewI"
      fullname="Courier New Italic"
      family="Courier New"
-     glyphs="Courier New Italic.ttf"
+     glyphs="/Courier New Italic.ttf"
      />
   <type
      format="ttf"
      name="CourierNew"
      fullname="Courier New"
      family="Courier New"
-     glyphs="Courier New.ttf"
+     glyphs="/Courier New.ttf"
      />
   <type
      format="ttf"
      name="DecoTypeNaskh"
      fullname="DecoType Naskh"
      family="DecoType Naskh"
-     glyphs="DecoTypeNaskh.ttf"
+     glyphs="/DecoTypeNaskh.ttf"
      />
   <type
      format="ttf"
      name="Devanagari"
      fullname="Devanagari MT"
      family="Devanagari "
-     glyphs="DevanagariMT.ttf"
+     glyphs="/DevanagariMT.ttf"
      />
   <type
      format="ttf"
      name="DevanagariB"
      fullname="Devanagari MT Bold"
      family="Devanagari "
-     glyphs="DevanagariMTBold.ttf"
+     glyphs="/DevanagariMTBold.ttf"
      />
   <type
      format="ttf"
      name="EuphemiaUCASB"
      fullname="Euphemia UCAS Bold"
      family="Euphemia UCAS"
-     glyphs="EuphemiaCASBold.ttf"
+     glyphs="/EuphemiaCASBold.ttf"
      />
   <type
      format="ttf"
      name="EuphemiaUCASI"
      fullname="Euphemia UCAS Italic"
      family="Euphemia UCAS"
-     glyphs="EuphemiaCASItalic.ttf"
+     glyphs="/EuphemiaCASItalic.ttf"
      />
   <type
      format="ttf"
      name="EuphemiaUCAS"
      fullname="Euphemia UCAS"
      family="Euphemia UCAS"
-     glyphs="EuphemiaCASRegular.ttf"
+     glyphs="/EuphemiaCASRegular.ttf"
      />
   <type
      format="ttf"
      name="GeorgiaBI"
      fullname="Georgia Bold Italic"
      family="Georgia"
-     glyphs="Georgia Bold Italic.ttf"
+     glyphs="/Georgia Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="GeorgiaB"
      fullname="Georgia Bold"
      family="Georgia"
-     glyphs="Georgia Bold.ttf"
+     glyphs="/Georgia Bold.ttf"
      />
   <type
      format="ttf"
      name="GeorgiaI"
      fullname="Georgia Italic"
      family="Georgia"
-     glyphs="Georgia Italic.ttf"
+     glyphs="/Georgia Italic.ttf"
      />
   <type
      format="ttf"
      name="Georgia"
      fullname="Georgia"
      family="Georgia"
-     glyphs="Georgia.ttf"
+     glyphs="/Georgia.ttf"
      />
   <type
      format="ttf"
      name="GreekMathSymbols"
      fullname="GreekMathSymbols Normal"
      family="GreekMathSymbols"
-     glyphs="GreekMathSymbols Normal.ttf"
+     glyphs="/GreekMathSymbols Normal.ttf"
      />
   <type
      format="ttf"
      name="Gujarati"
      fullname="Gujarati MT"
      family="Gujarati "
-     glyphs="GujaratiMT.ttf"
+     glyphs="/GujaratiMT.ttf"
      />
   <type
      format="ttf"
      name="GujaratiB"
      fullname="Gujarati MT Bold"
      family="Gujarati "
-     glyphs="GujaratiMTBold.ttf"
+     glyphs="/GujaratiMTBold.ttf"
      />
   <type
      format="ttf"
      name="Gulim"
      fullname="Gulim"
      family="Gulim"
-     glyphs="Gulim.ttf"
+     glyphs="/Gulim.ttf"
      />
   <type
      format="ttf"
      name="GungSeo"
      fullname="GungSeo Regular"
      family="GungSeo"
-     glyphs="Gungseouche.ttf"
+     glyphs="/Gungseouche.ttf"
      />
   <type
      format="ttf"
      name="Gurmukhi"
      fullname="Gurmukhi MT"
      family="Gurmukhi "
-     glyphs="Gurmukhi.ttf"
+     glyphs="/Gurmukhi.ttf"
      />
   <type
      format="ttf"
      name="HeadLineA"
      fullname="HeadLineA Regular"
      family="HeadLineA"
-     glyphs="HeadlineA.ttf"
+     glyphs="/HeadlineA.ttf"
      />
   <type
      format="ttf"
      name="Hei"
      fullname="Hei Regular"
      family="Hei"
-     glyphs="Hei.ttf"
+     glyphs="/Hei.ttf"
      />
   <type
      format="ttf"
      name="Herculanum"
      fullname="Herculanum"
      family="Herculanum"
-     glyphs="Herculanum.ttf"
+     glyphs="/Herculanum.ttf"
      />
   <type
      format="ttf"
      name="HoeflerTextOrnaments"
      fullname="Hoefler Text Ornaments"
      family="Hoefler Text"
-     glyphs="Hoefler Text Ornaments.ttf"
+     glyphs="/Hoefler Text Ornaments.ttf"
      />
   <type
      format="ttf"
      name="Impact"
      fullname="Impact"
      family="Impact"
-     glyphs="Impact.ttf"
+     glyphs="/Impact.ttf"
      />
   <type
      format="ttf"
      name="InaiMathi"
      fullname="InaiMathi"
      family="InaiMathi"
-     glyphs="InaiMathi.ttf"
+     glyphs="/InaiMathi.ttf"
      />
   <type
      format="ttf"
      name="Kai"
      fullname="Kai Regular"
      family="Kai"
-     glyphs="Kai.ttf"
+     glyphs="/Kai.ttf"
      />
   <type
      format="ttf"
      name="Kailasa"
      fullname="Kailasa Regular"
      family="Kailasa"
-     glyphs="Kailasa.ttf"
+     glyphs="/Kailasa.ttf"
      />
   <type
      format="ttf"
      name="Kokonor"
      fullname="Kokonor Regular"
      family="Kokonor"
-     glyphs="Kokonor.ttf"
+     glyphs="/Kokonor.ttf"
      />
   <type
      format="ttf"
      name="Krungthep"
      fullname="Krungthep"
      family="Krungthep"
-     glyphs="Krungthep.ttf"
+     glyphs="/Krungthep.ttf"
      />
   <type
      format="ttf"
      name="KufiStandardGK"
      fullname="KufiStandardGK"
      family="KufiStandardGK"
-     glyphs="KufiStandardGK.ttf"
+     glyphs="/KufiStandardGK.ttf"
      />
   <type
      format="ttf"
      name="Symbol"
      fullname="Symbol"
      family="Symbol"
-     glyphs="MathSymbol.ttf"
+     glyphs="/MathSymbol.ttf"
      />
   <type
      format="ttf"
      name="Batang"
      fullname="Batang"
      family="Batang"
-     glyphs="Microsoft/Batang.ttf"
+     glyphs="/Microsoft/Batang.ttf"
      />
   <type
      format="ttf"
      name="BookshelfSymbol7"
      fullname="Bookshelf Symbol 7"
      family="Bookshelf Symbol 7"
-     glyphs="Microsoft/Bookshelf Symbol 7.ttf"
+     glyphs="/Microsoft/Bookshelf Symbol 7.ttf"
      />
   <type
      format="ttf"
      name="BrushScriptI"
      fullname="Brush Script MT Italic"
      family="Brush Script "
-     glyphs="Microsoft/Brush Script.ttf"
+     glyphs="/Microsoft/Brush Script.ttf"
      />
   <type
      format="ttf"
      name="CalibriBI"
      fullname="Calibri Bold Italic"
      family="Calibri"
-     glyphs="Microsoft/Calibri Bold Italic.ttf"
+     glyphs="/Microsoft/Calibri Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="CalibriB"
      fullname="Calibri Bold"
      family="Calibri"
-     glyphs="Microsoft/Calibri Bold.ttf"
+     glyphs="/Microsoft/Calibri Bold.ttf"
      />
   <type
      format="ttf"
      name="CalibriI"
      fullname="Calibri Italic"
      family="Calibri"
-     glyphs="Microsoft/Calibri Italic.ttf"
+     glyphs="/Microsoft/Calibri Italic.ttf"
      />
   <type
      format="ttf"
      name="Calibri"
      fullname="Calibri"
      family="Calibri"
-     glyphs="Microsoft/Calibri.ttf"
+     glyphs="/Microsoft/Calibri.ttf"
      />
   <type
      format="ttf"
      name="CambriaBI"
      fullname="Cambria Bold Italic"
      family="Cambria"
-     glyphs="Microsoft/Cambria Bold Italic.ttf"
+     glyphs="/Microsoft/Cambria Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="CambriaB"
      fullname="Cambria Bold"
      family="Cambria"
-     glyphs="Microsoft/Cambria Bold.ttf"
+     glyphs="/Microsoft/Cambria Bold.ttf"
      />
   <type
      format="ttf"
      name="CambriaI"
      fullname="Cambria Italic"
      family="Cambria"
-     glyphs="Microsoft/Cambria Italic.ttf"
+     glyphs="/Microsoft/Cambria Italic.ttf"
      />
   <type
      format="ttf"
      name="Cambria"
      fullname="Cambria"
      family="Cambria"
-     glyphs="Microsoft/Cambria.ttf"
+     glyphs="/Microsoft/Cambria.ttf"
      />
   <type
      format="ttf"
      name="CandaraBI"
      fullname="Candara Bold Italic"
      family="Candara"
-     glyphs="Microsoft/Candara Bold Italic.ttf"
+     glyphs="/Microsoft/Candara Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="CandaraB"
      fullname="Candara Bold"
      family="Candara"
-     glyphs="Microsoft/Candara Bold.ttf"
+     glyphs="/Microsoft/Candara Bold.ttf"
      />
   <type
      format="ttf"
      name="CandaraI"
      fullname="Candara Italic"
      family="Candara"
-     glyphs="Microsoft/Candara Italic.ttf"
+     glyphs="/Microsoft/Candara Italic.ttf"
      />
   <type
      format="ttf"
      name="Candara"
      fullname="Candara"
      family="Candara"
-     glyphs="Microsoft/Candara.ttf"
+     glyphs="/Microsoft/Candara.ttf"
      />
   <type
      format="ttf"
      name="ConsolasBI"
      fullname="Consolas Bold Italic"
      family="Consolas"
-     glyphs="Microsoft/Consolas Bold Italic.ttf"
+     glyphs="/Microsoft/Consolas Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="ConsolasB"
      fullname="Consolas Bold"
      family="Consolas"
-     glyphs="Microsoft/Consolas Bold.ttf"
+     glyphs="/Microsoft/Consolas Bold.ttf"
      />
   <type
      format="ttf"
      name="ConsolasI"
      fullname="Consolas Italic"
      family="Consolas"
-     glyphs="Microsoft/Consolas Italic.ttf"
+     glyphs="/Microsoft/Consolas Italic.ttf"
      />
   <type
      format="ttf"
      name="Consolas"
      fullname="Consolas"
      family="Consolas"
-     glyphs="Microsoft/Consolas.ttf"
+     glyphs="/Microsoft/Consolas.ttf"
      />
   <type
      format="ttf"
      name="ConstantiaTestI"
      fullname="Constantia Test Italic"
      family="Constantia"
-     glyphs="Microsoft/Constantia Bold Italic.ttf"
+     glyphs="/Microsoft/Constantia Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="ConstantiaB"
      fullname="Constantia Bold"
      family="Constantia"
-     glyphs="Microsoft/Constantia Bold.ttf"
+     glyphs="/Microsoft/Constantia Bold.ttf"
      />
   <type
      format="ttf"
      name="ConstantiaI"
      fullname="Constantia Italic"
      family="Constantia"
-     glyphs="Microsoft/Constantia Italic.ttf"
+     glyphs="/Microsoft/Constantia Italic.ttf"
      />
   <type
      format="ttf"
      name="Constantia"
      fullname="Constantia"
      family="Constantia"
-     glyphs="Microsoft/Constantia.ttf"
+     glyphs="/Microsoft/Constantia.ttf"
      />
   <type
      format="ttf"
      name="CorbelTestBI"
      fullname="Corbel Test Bold Italic"
      family="Corbel"
-     glyphs="Microsoft/Corbel Bold Italic.ttf"
+     glyphs="/Microsoft/Corbel Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="CorbelTestB"
      fullname="Corbel Test Bold"
      family="Corbel"
-     glyphs="Microsoft/Corbel Bold.ttf"
+     glyphs="/Microsoft/Corbel Bold.ttf"
      />
   <type
      format="ttf"
      name="CorbelI"
      fullname="Corbel Italic"
      family="Corbel"
-     glyphs="Microsoft/Corbel Italic.ttf"
+     glyphs="/Microsoft/Corbel Italic.ttf"
      />
   <type
      format="ttf"
      name="Corbel"
      fullname="Corbel"
      family="Corbel"
-     glyphs="Microsoft/Corbel.ttf"
+     glyphs="/Microsoft/Corbel.ttf"
      />
   <type
      format="ttf"
      name="FranklinGothicBookI"
      fullname="Franklin Gothic Book Italic"
      family="Franklin Gothic Book"
-     glyphs="Microsoft/Franklin Gothic Book Italic.ttf"
+     glyphs="/Microsoft/Franklin Gothic Book Italic.ttf"
      />
   <type
      format="ttf"
      name="FranklinGothicBook"
      fullname="Franklin Gothic Book"
      family="Franklin Gothic Book"
-     glyphs="Microsoft/Franklin Gothic Book.ttf"
+     glyphs="/Microsoft/Franklin Gothic Book.ttf"
      />
   <type
      format="ttf"
      name="FranklinGothicMI"
      fullname="Franklin Gothic Medium Italic"
      family="Franklin Gothic Medium"
-     glyphs="Microsoft/Franklin Gothic Medium Italic.ttf"
+     glyphs="/Microsoft/Franklin Gothic Medium Italic.ttf"
      />
   <type
      format="ttf"
      name="FranklinGothicM"
      fullname="Franklin Gothic Medium"
      family="Franklin Gothic Medium"
-     glyphs="Microsoft/Franklin Gothic Medium.ttf"
+     glyphs="/Microsoft/Franklin Gothic Medium.ttf"
      />
   <type
      format="ttf"
      name="GillSansBI"
      fullname="Gill Sans MT Bold Italic"
      family="Gill Sans "
-     glyphs="Microsoft/Gill Sans MT Bold Italic.ttf"
+     glyphs="/Microsoft/Gill Sans MT Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="GillSansB"
      fullname="Gill Sans MT Bold"
      family="Gill Sans "
-     glyphs="Microsoft/Gill Sans MT Bold.ttf"
+     glyphs="/Microsoft/Gill Sans MT Bold.ttf"
      />
   <type
      format="ttf"
      name="GillSansI"
      fullname="Gill Sans MT Italic"
      family="Gill Sans "
-     glyphs="Microsoft/Gill Sans MT Italic.ttf"
+     glyphs="/Microsoft/Gill Sans MT Italic.ttf"
      />
   <type
      format="ttf"
      name="GillSans"
      fullname="Gill Sans MT"
      family="Gill Sans "
-     glyphs="Microsoft/Gill Sans MT.ttf"
+     glyphs="/Microsoft/Gill Sans MT.ttf"
      />
   <type
      format="ttf"
      name="Gulim"
      fullname="Gulim"
      family="Gulim"
-     glyphs="Microsoft/Gulim.ttf"
+     glyphs="/Microsoft/Gulim.ttf"
      />
   <type
      format="ttf"
      name="LucidaConsole"
      fullname="Lucida Console"
      family="Lucida Console"
-     glyphs="Microsoft/Lucida Console.ttf"
+     glyphs="/Microsoft/Lucida Console.ttf"
      />
   <type
      format="ttf"
      name="LucidaSansUnicode"
      fullname="Lucida Sans Unicode"
      family="Lucida Sans Unicode"
-     glyphs="Microsoft/Lucida Sans Unicode.ttf"
+     glyphs="/Microsoft/Lucida Sans Unicode.ttf"
      />
   <type
      format="ttf"
      name="Marlett"
      fullname="Marlett"
      family="Marlett"
-     glyphs="Microsoft/Marlett.ttf"
+     glyphs="/Microsoft/Marlett.ttf"
      />
   <type
      format="ttf"
      name="MeiryoBI"
      fullname="Meiryo Bold Italic"
      family="Meiryo"
-     glyphs="Microsoft/Meiryo Bold Italic.ttf"
+     glyphs="/Microsoft/Meiryo Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="MeiryoB"
      fullname="Meiryo Bold"
      family="Meiryo"
-     glyphs="Microsoft/Meiryo Bold.ttf"
+     glyphs="/Microsoft/Meiryo Bold.ttf"
      />
   <type
      format="ttf"
      name="MeiryoI"
      fullname="Meiryo Italic"
      family="Meiryo"
-     glyphs="Microsoft/Meiryo Italic.ttf"
+     glyphs="/Microsoft/Meiryo Italic.ttf"
      />
   <type
      format="ttf"
      name="Meiryo"
      fullname="Meiryo"
      family="Meiryo"
-     glyphs="Microsoft/Meiryo.ttf"
+     glyphs="/Microsoft/Meiryo.ttf"
      />
   <type
      format="ttf"
      name="Gothic"
      fullname="MS Gothic"
      family="Gothic"
-     glyphs="Microsoft/MS Gothic.ttf"
+     glyphs="/Microsoft/MS Gothic.ttf"
      />
   <type
      format="ttf"
      name="Mincho"
      fullname="MS Mincho"
      family="Mincho"
-     glyphs="Microsoft/MS Mincho.ttf"
+     glyphs="/Microsoft/MS Mincho.ttf"
      />
   <type
      format="ttf"
      name="PGothic"
      fullname="MS PGothic"
      family="PGothic"
-     glyphs="Microsoft/MS PGothic.ttf"
+     glyphs="/Microsoft/MS PGothic.ttf"
      />
   <type
      format="ttf"
      name="PMincho"
      fullname="MS PMincho"
      family="PMincho"
-     glyphs="Microsoft/MS PMincho.ttf"
+     glyphs="/Microsoft/MS PMincho.ttf"
      />
   <type
      format="ttf"
      name="ReferenceSansSerif"
      fullname="MS Reference Sans Serif"
      family="Reference Sans Serif"
-     glyphs="Microsoft/MS Reference Sans Serif.ttf"
+     glyphs="/Microsoft/MS Reference Sans Serif.ttf"
      />
   <type
      format="ttf"
      name="ReferenceSpecialty"
      fullname="MS Reference Specialty"
      family="Reference Specialty"
-     glyphs="Microsoft/MS Reference Specialty.ttf"
+     glyphs="/Microsoft/MS Reference Specialty.ttf"
      />
   <type
      format="ttf"
      name="PerpetuaBI"
      fullname="Perpetua Bold Italic"
      family="Perpetua"
-     glyphs="Microsoft/Perpetua Bold Italic.ttf"
+     glyphs="/Microsoft/Perpetua Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="PerpetuaB"
      fullname="Perpetua Bold"
      family="Perpetua"
-     glyphs="Microsoft/Perpetua Bold.ttf"
+     glyphs="/Microsoft/Perpetua Bold.ttf"
      />
   <type
      format="ttf"
      name="PerpetuaI"
      fullname="Perpetua Italic"
      family="Perpetua"
-     glyphs="Microsoft/Perpetua Italic.ttf"
+     glyphs="/Microsoft/Perpetua Italic.ttf"
      />
   <type
      format="ttf"
      name="Perpetua"
      fullname="Perpetua"
      family="Perpetua"
-     glyphs="Microsoft/Perpetua.ttf"
+     glyphs="/Microsoft/Perpetua.ttf"
      />
   <type
      format="ttf"
      name="PMingLiU"
      fullname="PMingLiU"
      family="PMingLiU"
-     glyphs="Microsoft/PMingLiU.ttf"
+     glyphs="/Microsoft/PMingLiU.ttf"
      />
   <type
      format="ttf"
      name="SimSun"
      fullname="SimSun"
      family="SimSun"
-     glyphs="Microsoft/SimSun.ttf"
+     glyphs="/Microsoft/SimSun.ttf"
      />
   <type
      format="ttf"
      name="TwCenBI"
      fullname="Tw Cen MT Bold Italic"
      family="Tw Cen "
-     glyphs="Microsoft/Tw Cen MT Bold Italic.ttf"
+     glyphs="/Microsoft/Tw Cen MT Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="TwCenB"
      fullname="Tw Cen MT Bold"
      family="Tw Cen "
-     glyphs="Microsoft/Tw Cen MT Bold.ttf"
+     glyphs="/Microsoft/Tw Cen MT Bold.ttf"
      />
   <type
      format="ttf"
      name="TwCenI"
      fullname="Tw Cen MT Italic"
      family="Tw Cen "
-     glyphs="Microsoft/Tw Cen MT Italic.ttf"
+     glyphs="/Microsoft/Tw Cen MT Italic.ttf"
      />
   <type
      format="ttf"
      name="TwCen"
      fullname="Tw Cen MT"
      family="Tw Cen "
-     glyphs="Microsoft/Tw Cen MT.ttf"
+     glyphs="/Microsoft/Tw Cen MT.ttf"
      />
   <type
      format="ttf"
      name="MicrosoftSansSerif"
      fullname="Microsoft Sans Serif"
      family="Microsoft Sans Serif"
-     glyphs="Microsoft Sans Serif.ttf"
+     glyphs="/Microsoft Sans Serif.ttf"
      />
   <type
      format="ttf"
      name="Gothic"
      fullname="MS Gothic"
      family="Gothic"
-     glyphs="MS Gothic.ttf"
+     glyphs="/MS Gothic.ttf"
      />
   <type
      format="ttf"
      name="Mincho"
      fullname="MS Mincho"
      family="Mincho"
-     glyphs="MS Mincho.ttf"
+     glyphs="/MS Mincho.ttf"
      />
   <type
      format="ttf"
      name="PGothic"
      fullname="MS PGothic"
      family="PGothic"
-     glyphs="MS PGothic.ttf"
+     glyphs="/MS PGothic.ttf"
      />
   <type
      format="ttf"
      name="PMincho"
      fullname="MS PMincho"
      family="PMincho"
-     glyphs="MS PMincho.ttf"
+     glyphs="/MS PMincho.ttf"
      />
   <type
      format="ttf"
      name="MshtakanB"
      fullname="Mshtakan Bold"
      family="Mshtakan"
-     glyphs="MshtakanBold.ttf"
+     glyphs="/MshtakanBold.ttf"
      />
   <type
      format="ttf"
      name="MshtakanBoldOblique"
      fullname="Mshtakan BoldOblique"
      family="Mshtakan"
-     glyphs="MshtakanBoldOblique.ttf"
+     glyphs="/MshtakanBoldOblique.ttf"
      />
   <type
      format="ttf"
      name="MshtakanOb"
      fullname="Mshtakan Oblique"
      family="Mshtakan"
-     glyphs="MshtakanOblique.ttf"
+     glyphs="/MshtakanOblique.ttf"
      />
   <type
      format="ttf"
      name="Mshtakan"
      fullname="Mshtakan"
      family="Mshtakan"
-     glyphs="MshtakanRegular.ttf"
+     glyphs="/MshtakanRegular.ttf"
      />
   <type
      format="ttf"
      name="Nadeem"
      fullname="Nadeem"
      family="Nadeem"
-     glyphs="Nadeem.ttf"
+     glyphs="/Nadeem.ttf"
      />
   <type
      format="ttf"
      name="NewPeninim"
      fullname="New Peninim MT"
      family="New Peninim "
-     glyphs="NewPeninimMT.ttf"
+     glyphs="/NewPeninimMT.ttf"
      />
   <type
      format="ttf"
      name="NewPeninimB"
      fullname="New Peninim MT Bold"
      family="New Peninim "
-     glyphs="NewPeninimMTBold.ttf"
+     glyphs="/NewPeninimMTBold.ttf"
      />
   <type
      format="ttf"
      name="NewPeninimBInclined"
      fullname="New Peninim MT Bold Inclined"
      family="New Peninim "
-     glyphs="NewPeninimMTBoldInclined.ttf"
+     glyphs="/NewPeninimMTBoldInclined.ttf"
      />
   <type
      format="ttf"
      name="NewPeninimInclined"
      fullname="New Peninim MT Inclined"
      family="New Peninim "
-     glyphs="NewPeninimMTInclined.ttf"
+     glyphs="/NewPeninimMTInclined.ttf"
      />
   <type
      format="ttf"
      name="GB18030Bitmap"
      fullname="GB18030 Bitmap"
      family="GB18030 Bitmap"
-     glyphs="NISC18030.ttf"
+     glyphs="/NISC18030.ttf"
      />
   <type
      format="ttf"
      name="OpenSansB"
      fullname="Open Sans Bold"
      family="Open Sans"
-     glyphs="OpenSans-Bold.ttf"
+     glyphs="/OpenSans-Bold.ttf"
      />
   <type
      format="ttf"
      name="OpenSansBI"
      fullname="Open Sans Bold Italic"
      family="Open Sans"
-     glyphs="OpenSans-BoldItalic.ttf"
+     glyphs="/OpenSans-BoldItalic.ttf"
      />
   <type
      format="ttf"
      name="OpenSansXb"
      fullname="Open Sans Extrabold"
      family="Open Sans Extrabold"
-     glyphs="OpenSans-ExtraBold.ttf"
+     glyphs="/OpenSans-ExtraBold.ttf"
      />
   <type
      format="ttf"
      name="OpenSansXbI"
      fullname="Open Sans Extrabold Italic"
      family="Open Sans Extrabold"
-     glyphs="OpenSans-ExtraBoldItalic.ttf"
+     glyphs="/OpenSans-ExtraBoldItalic.ttf"
      />
   <type
      format="ttf"
      name="OpenSansI"
      fullname="Open Sans Italic"
      family="Open Sans"
-     glyphs="OpenSans-Italic.ttf"
+     glyphs="/OpenSans-Italic.ttf"
      />
   <type
      format="ttf"
      name="OpenSansL"
      fullname="Open Sans Light"
      family="Open Sans Light"
-     glyphs="OpenSans-Light.ttf"
+     glyphs="/OpenSans-Light.ttf"
      />
   <type
      format="ttf"
      name="OpenSansLI"
      fullname="Open Sans Light Italic"
      family="Open Sans Light"
-     glyphs="OpenSans-LightItalic.ttf"
+     glyphs="/OpenSans-LightItalic.ttf"
      />
   <type
      format="ttf"
      name="OpenSans"
      fullname="Open Sans"
      family="Open Sans"
-     glyphs="OpenSans-Regular.ttf"
+     glyphs="/OpenSans-Regular.ttf"
      />
   <type
      format="ttf"
      name="OpenSansSemibold"
      fullname="Open Sans Semibold"
      family="Open Sans Semibold"
-     glyphs="OpenSans-Semibold.ttf"
+     glyphs="/OpenSans-Semibold.ttf"
      />
   <type
      format="ttf"
      name="OpenSansSemiboldI"
      fullname="Open Sans Semibold Italic"
      family="Open Sans Semibold"
-     glyphs="OpenSans-SemiboldItalic.ttf"
+     glyphs="/OpenSans-SemiboldItalic.ttf"
      />
   <type
      format="ttf"
      name="Osaka"
      fullname="Osaka"
      family="Osaka"
-     glyphs="Osaka.ttf"
+     glyphs="/Osaka.ttf"
      />
   <type
      format="ttf"
      name="OsakaMono"
      fullname="Osaka-Mono"
      family="Osaka"
-     glyphs="OsakaMono.ttf"
+     glyphs="/OsakaMono.ttf"
      />
   <type
      format="ttf"
      name="PCMyungjo"
      fullname="PCMyungjo Regular"
      family="PCMyungjo"
-     glyphs="PCmyoungjo.ttf"
+     glyphs="/PCmyoungjo.ttf"
      />
   <type
      format="ttf"
      name="Pharmacy"
      fullname="Pharmacy"
      family="Pharmacy"
-     glyphs="Pharmacy.ttf"
+     glyphs="/Pharmacy.ttf"
      />
   <type
      format="ttf"
      name="PilGi"
      fullname="PilGi Regular"
      family="PilGi"
-     glyphs="Pilgiche.ttf"
+     glyphs="/Pilgiche.ttf"
      />
   <type
      format="ttf"
      name="PlantagenetCherokee"
      fullname="Plantagenet Cherokee"
      family="Plantagenet Cherokee"
-     glyphs="PlantagenetCherokee.ttf"
+     glyphs="/PlantagenetCherokee.ttf"
      />
   <type
      format="ttf"
      name="Raanana"
      fullname="Raanana"
      family="Raanana"
-     glyphs="Raanana.ttf"
+     glyphs="/Raanana.ttf"
      />
   <type
      format="ttf"
      name="RaananaB"
      fullname="Raanana Bold"
      family="Raanana"
-     glyphs="RaananaBold.ttf"
+     glyphs="/RaananaBold.ttf"
      />
   <type
      format="ttf"
      name="Sathu"
      fullname="Sathu"
      family="Sathu"
-     glyphs="Sathu.ttf"
+     glyphs="/Sathu.ttf"
      />
   <type
      format="ttf"
      name="Silom"
      fullname="Silom"
      family="Silom"
-     glyphs="Silom.ttf"
+     glyphs="/Silom.ttf"
      />
   <type
      format="ttf"
      name="SimSun"
      fullname="SimSun"
      family="SimSun"
-     glyphs="SimSun.ttf"
+     glyphs="/SimSun.ttf"
      />
   <type
      format="ttf"
      name="Skia"
      fullname="Skia Regular"
      family="Skia"
-     glyphs="Skia.ttf"
+     glyphs="/Skia.ttf"
      />
   <type
      format="ttf"
      name="Starburst"
      fullname="Starburst Regular"
      family="Starburst"
-     glyphs="starburst.ttf"
+     glyphs="/starburst.ttf"
      />
   <type
      format="ttf"
      name="Symbol"
      fullname="Symbol"
      family="Symbol"
-     glyphs="Symbol.ttf"
+     glyphs="/Symbol.ttf"
      />
   <type
      format="ttf"
      name="TahomaB"
      fullname="Tahoma Bold"
      family="Tahoma"
-     glyphs="Tahoma Bold.ttf"
+     glyphs="/Tahoma Bold.ttf"
      />
   <type
      format="ttf"
      name="Tahoma"
      fullname="Tahoma"
      family="Tahoma"
-     glyphs="Tahoma.ttf"
+     glyphs="/Tahoma.ttf"
      />
   <type
      format="ttf"
      name="TimesNewRomanBI"
      fullname="Times New Roman Bold Italic"
      family="Times New Roman"
-     glyphs="Times New Roman Bold Italic.ttf"
+     glyphs="/Times New Roman Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="TimesNewRomanB"
      fullname="Times New Roman Bold"
      family="Times New Roman"
-     glyphs="Times New Roman Bold.ttf"
+     glyphs="/Times New Roman Bold.ttf"
      />
   <type
      format="ttf"
      name="TimesNewRomanI"
      fullname="Times New Roman Italic"
      family="Times New Roman"
-     glyphs="Times New Roman Italic.ttf"
+     glyphs="/Times New Roman Italic.ttf"
      />
   <type
      format="ttf"
      name="TimesNewRoman"
      fullname="Times New Roman"
      family="Times New Roman"
-     glyphs="Times New Roman.ttf"
+     glyphs="/Times New Roman.ttf"
      />
   <type
      format="ttf"
      name="TrebuchetMSBI"
      fullname="Trebuchet MS Bold Italic"
      family="Trebuchet"
-     glyphs="Trebuchet MS Bold Italic.ttf"
+     glyphs="/Trebuchet MS Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="TrebuchetMSB"
      fullname="Trebuchet MS Bold"
      family="Trebuchet"
-     glyphs="Trebuchet MS Bold.ttf"
+     glyphs="/Trebuchet MS Bold.ttf"
      />
   <type
      format="ttf"
      name="TrebuchetMSI"
      fullname="Trebuchet MS Italic"
      family="Trebuchet"
-     glyphs="Trebuchet MS Italic.ttf"
+     glyphs="/Trebuchet MS Italic.ttf"
      />
   <type
      format="ttf"
      name="Trebuchet"
      fullname="Trebuchet MS"
      family="Trebuchet"
-     glyphs="Trebuchet MS.ttf"
+     glyphs="/Trebuchet MS.ttf"
      />
   <type
      format="ttf"
      name="Vademecum"
      fullname="Vademecum"
      family="Vademecum"
-     glyphs="vademecu.ttf"
+     glyphs="/vademecu.ttf"
      />
   <type
      format="ttf"
      name="VerdanaBI"
      fullname="Verdana Bold Italic"
      family="Verdana"
-     glyphs="Verdana Bold Italic.ttf"
+     glyphs="/Verdana Bold Italic.ttf"
      />
   <type
      format="ttf"
      name="VerdanaB"
      fullname="Verdana Bold"
      family="Verdana"
-     glyphs="Verdana Bold.ttf"
+     glyphs="/Verdana Bold.ttf"
      />
   <type
      format="ttf"
      name="VerdanaI"
      fullname="Verdana Italic"
      family="Verdana"
-     glyphs="Verdana Italic.ttf"
+     glyphs="/Verdana Italic.ttf"
      />
   <type
      format="ttf"
      name="Verdana"
      fullname="Verdana"
      family="Verdana"
-     glyphs="Verdana.ttf"
+     glyphs="/Verdana.ttf"
      />
   <type
      format="ttf"
      name="Webdings"
      fullname="Webdings"
      family="Webdings"
-     glyphs="Webdings.ttf"
+     glyphs="/Webdings.ttf"
      />
   <type
      format="ttf"
      name="Wingdings2"
      fullname="Wingdings 2"
      family="Wingdings 2"
-     glyphs="Wingdings 2.ttf"
+     glyphs="/Wingdings 2.ttf"
      />
   <type
      format="ttf"
      name="Wingdings3"
      fullname="Wingdings 3"
      family="Wingdings 3"
-     glyphs="Wingdings 3.ttf"
+     glyphs="/Wingdings 3.ttf"
      />
   <type
      format="ttf"
      name="Wingdings"
      fullname="Wingdings"
      family="Wingdings"
-     glyphs="Wingdings.ttf"
+     glyphs="/Wingdings.ttf"
      />
   <type
      format="ttf"
      name="Zapfino"
      fullname="Zapfino"
      family="Zapfino"
-     glyphs="Zapfino.ttf"
+     glyphs="/Zapfino.ttf"
      />
   <type
      format="ttf"
      name="Zymbols"
      fullname="Zymbols"
      family="Zymbols"
-     glyphs="Zymbols.ttf"
+     glyphs="/Zymbols.ttf"
      />
   <type
      format="ttf"
      name="LiSongPro"
      fullname="LiSong Pro"
      family="LiSong Pro"
-     glyphs="å\84·å®\8b Pro.ttf"
+     glyphs="/å\84·å®\8b Pro.ttf"
      />
   <type
      format="ttf"
      name="STFangsong"
      fullname="STFangsong"
      family="STFangsong"
-     glyphs="å\8d\8eæ\96\87仿å®\8b.ttf"
+     glyphs="/å\8d\8eæ\96\87仿å®\8b.ttf"
      />
   <type
      format="ttf"
      name="STSong"
      fullname="STSong"
      family="STSong"
-     glyphs="å\8d\8eæ\96\87å®\8bä½\93.ttf"
+     glyphs="/å\8d\8eæ\96\87å®\8bä½\93.ttf"
      />
   <type
      format="ttf"
      name="STKaiti"
      fullname="STKaiti"
      family="STKaiti"
-     glyphs="å\8d\8eæ\96\87楷ä½\93.ttf"
+     glyphs="/å\8d\8eæ\96\87楷ä½\93.ttf"
      />
 </typemap>

diff --git a/ImageMagick-6/type-dejavu.xml b/ImageMagick-6/type-dejavu.xml
index 88c0d72240c71f7419b118965c44408e2353b801..a60e597c6f9162f93b03c3d77636fdca3ebda2ce 100644 (file)
--- a/ImageMagick-6/type-dejavu.xml
+++ b/ImageMagick-6/type-dejavu.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type fullname="" family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick DejaVU font configuration.
+-->
 <typemap>
   <type name="DejaVu-LGC-Sans-Bold" fullname="DejaVu LGC Sans Bold" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="700" glyphs="/usr/share/fonts/dejavu/DejaVuLGCSans-Bold.ttf"/>
   <type name="DejaVu-LGC-Sans-Bold-Oblique" fullname="DejaVu LGC Sans Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="700" glyphs="/usr/share/fonts/dejavu/DejaVuLGCSans-BoldOblique.ttf"/>

diff --git a/ImageMagick-6/type-ghostscript.xml b/ImageMagick-6/type-ghostscript.xml
index 213cb31a627f5a73f51fa6c3cbaa5133949246f3..a28d43dcc10514bb313f2a33f6af30c6a1062cb2 100644 (file)
--- a/ImageMagick-6/type-ghostscript.xml
+++ b/ImageMagick-6/type-ghostscript.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick Ghostscript font configuration.
+-->
 <typemap>
   <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/urw-fonts/a010013l.afm" glyphs="/usr/share/fonts/urw-fonts/a010013l.pfb"/>
   <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="/usr/share/fonts/urw-fonts/a010033l.afm" glyphs="/usr/share/fonts/urw-fonts/a010033l.pfb"/>

diff --git a/ImageMagick-6/type-windows.xml b/ImageMagick-6/type-windows.xml
index f518c3a44b48d1f3d8c8bc8bc521916fd4ad0d30..2c7d9117f7fb9fe1ee4377628b4be1ae2b5dd11f 100644 (file)
--- a/ImageMagick-6/type-windows.xml
+++ b/ImageMagick-6/type-windows.xml
@@ -16,6 +16,9 @@
 <!ATTLIST type version CDATA #IMPLIED>
 <!ATTLIST include file CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick Windows font configuration.
+-->
 <typemap>
   <type name="Arial" fullname="Arial" family="Arial" weight="400" style="normal" stretch="normal" glyphs="/usr/share/fonts/corefonts/arial.ttf"/>
   <type name="Arial-Black" fullname="Arial Black" family="Arial" weight="900" style="normal" stretch="normal" glyphs="/usr/share/fonts/corefonts/ariblk.ttf"/>

diff --git a/ImageMagick-6/type.xml b/ImageMagick-6/type.xml
index 6a8ee9dfd7d519daf70eb4457e6a091a9a2875d6..f21c7dd825b20b744a8144024e9f07bcdbf8b599 100644 (file)
--- a/ImageMagick-6/type.xml
+++ b/ImageMagick-6/type.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
 ]>
+<!--
+  ImageMagick font configuration.
+-->
 <typemap>
    <include file="type-dejavu.xml" /> <include file="type-ghostscript.xml" /> <include file="type-windows.xml" />
 </typemap>