summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2012-05-15 09:09:59 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2012-05-15 09:09:59 +0000
commit4c41a5d82ba0bfa18565d06a952d4d1ff323bc0d (patch)
tree7044ab43991aa318a52f67e7565ab9a4da2ca5da
parent2d7bf40c83133dc90180f60b9a30cf43ff98ea1e (diff)
XeTeX fontconfig weeded and updated
git-svn-id: svn://tug.org/texlive/trunk@26400 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/tlpostcode/xetex/conf/conf.d/51-local.conf1
-rw-r--r--Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd13
2 files changed, 8 insertions, 6 deletions
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/51-local.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/51-local.conf
index d35046e78b3..ca9fbe19592 100644
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/51-local.conf
+++ b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/51-local.conf
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.avail/51-local.conf file to configure system font access -->
<fontconfig>
<!-- Load local system customization file -->
<include ignore_missing="yes">local.conf</include>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd b/Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd
index a5c54f98352..5f072ee44e3 100644
--- a/Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd
+++ b/Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd
@@ -63,7 +63,7 @@
the set of valid Unicode chars. This idea
was borrowed from Mozilla
-->
-<!ELEMENT blank (int)*>
+<!ELEMENT blank (int|range)*>
<!--
Aliases are just a special case for multiple match elements
@@ -107,20 +107,22 @@
<!ELEMENT pattern (patelt)*>
-<!ENTITY % constant 'int|double|string|matrix|bool|charset|const'>
+<!ENTITY % constant 'int|double|string|matrix|bool|charset|langset|const'>
<!ELEMENT patelt (%constant;)*>
<!ATTLIST patelt
name CDATA #REQUIRED>
<!ELEMENT alias (family*, prefer?, accept?, default?)>
+<!ATTLIST alias
+ binding (weak|strong|same) "weak">
<!ELEMENT prefer (family)*>
<!ELEMENT accept (family)*>
<!ELEMENT default (family)*>
<!ELEMENT family (#PCDATA)>
<!ATTLIST family xml:space (default|preserve) 'preserve'>
-<!ENTITY % expr 'int|double|string|matrix|bool|charset
+<!ENTITY % expr 'int|double|string|matrix|bool|charset|langset
|name|const
|or|and|eq|not_eq|less|less_eq|more|more_eq|contains|not_contains
|plus|minus|times|divide|not|if|floor|ceil|round|trunc'>
@@ -194,8 +196,9 @@
<!ATTLIST string xml:space (default|preserve) 'preserve'>
<!ELEMENT matrix (double,double,double,double)>
<!ELEMENT bool (#PCDATA)>
-<!ELEMENT charset (#PCDATA)>
-<!ATTLIST charset xml:space (default|preserve) 'preserve'>
+<!ELEMENT charset (int|range)*>
+<!ELEMENT range (int,int)>
+<!ELEMENT langset (string)*>
<!ELEMENT name (#PCDATA)>
<!ATTLIST name xml:space (default|preserve) 'preserve'>
<!ELEMENT const (#PCDATA)>