conf.d/09-autohint-if-no-hinting.conf | 4 ---- conf.d/10-autohint.conf | 4 ---- conf.d/10-hinting-full.conf | 4 ---- conf.d/10-hinting-medium.conf | 4 ---- conf.d/10-hinting-none.conf | 4 ---- conf.d/10-hinting-slight.conf | 4 ---- conf.d/10-no-sub-pixel.conf | 4 ---- conf.d/10-scale-bitmap-fonts.conf | 4 ---- conf.d/10-sub-pixel-bgr.conf | 4 ---- conf.d/10-sub-pixel-rgb.conf | 4 ---- conf.d/10-sub-pixel-vbgr.conf | 4 ---- conf.d/10-sub-pixel-vrgb.conf | 4 ---- conf.d/10-unhinted.conf | 4 ---- conf.d/11-lcdfilter-default.conf | 4 ---- conf.d/11-lcdfilter-legacy.conf | 4 ---- conf.d/11-lcdfilter-light.conf | 4 ---- conf.d/20-unhint-small-vera.conf | 4 ---- conf.d/25-unhint-nonlatin.conf | 4 ---- conf.d/30-metric-aliases.conf | 4 ---- conf.d/40-nonlatin.conf | 4 ---- conf.d/45-generic.conf | 4 ---- conf.d/45-latin.conf | 4 ---- conf.d/49-sansserif.conf | 4 ---- conf.d/50-user.conf | 4 ---- conf.d/51-local.conf | 4 ---- conf.d/60-generic.conf | 4 ---- conf.d/60-latin.conf | 4 ---- conf.d/65-fonts-persian.conf | 5 ----- conf.d/65-khmer.conf | 4 ---- conf.d/65-nonlatin.conf | 4 ---- conf.d/69-unifont.conf | 4 ---- conf.d/70-no-bitmaps.conf | 4 ---- conf.d/70-yes-bitmaps.conf | 4 ---- conf.d/80-delicious.conf | 4 ---- conf.d/90-synthetic.conf | 4 ---- fc-lang/Makefile.am | 4 +++- 36 files changed, 3 insertions(+), 142 deletions(-) New commits: commit 528b17b2837c3b102acd90cc7548d07bacaccb1f Author: Akira TAGOH <akira@xxxxxxxxx> Date: Tue May 19 14:12:15 2020 +0900 Drop elements with its namespace from conf The translation related elements are now provided by separate files fontconfig.its and fontconfig.loc. we don't need to have it in conf anymore. Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/234 diff --git a/conf.d/09-autohint-if-no-hinting.conf b/conf.d/09-autohint-if-no-hinting.conf index 5e91ae6..90d4614 100644 --- a/conf.d/09-autohint-if-no-hinting.conf +++ b/conf.d/09-autohint-if-no-hinting.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Enable autohinter if font doesn't have any hinting</description> <!-- Use the Autohinter --> <match target="font"> diff --git a/conf.d/10-autohint.conf b/conf.d/10-autohint.conf index 04f4cd4..7460249 100644 --- a/conf.d/10-autohint.conf +++ b/conf.d/10-autohint.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Enable autohinter</description> <!-- Use the Autohinter --> <match target="pattern"> diff --git a/conf.d/10-hinting-full.conf b/conf.d/10-hinting-full.conf index 03e7bb3..bbba6ff 100644 --- a/conf.d/10-hinting-full.conf +++ b/conf.d/10-hinting-full.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set hintfull to hintstyle</description> <match target="pattern"> diff --git a/conf.d/10-hinting-medium.conf b/conf.d/10-hinting-medium.conf index 83d5f95..ea48dd7 100644 --- a/conf.d/10-hinting-medium.conf +++ b/conf.d/10-hinting-medium.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set hintmedium to hintstyle</description> <match target="pattern"> diff --git a/conf.d/10-hinting-none.conf b/conf.d/10-hinting-none.conf index 876d135..c8c554a 100644 --- a/conf.d/10-hinting-none.conf +++ b/conf.d/10-hinting-none.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set hintnone to hintstyle</description> <match target="pattern"> diff --git a/conf.d/10-hinting-slight.conf b/conf.d/10-hinting-slight.conf index c9e4ef7..4374747 100644 --- a/conf.d/10-hinting-slight.conf +++ b/conf.d/10-hinting-slight.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set hintslight to hintstyle</description> <match target="pattern"> diff --git a/conf.d/10-no-sub-pixel.conf b/conf.d/10-no-sub-pixel.conf index a266442..782b521 100644 --- a/conf.d/10-no-sub-pixel.conf +++ b/conf.d/10-no-sub-pixel.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Disable sub-pixel rendering</description> <!-- Disable sub-pixel rendering --> <match target="pattern"> diff --git a/conf.d/10-scale-bitmap-fonts.conf b/conf.d/10-scale-bitmap-fonts.conf index db563d0..0c3a2ef 100644 --- a/conf.d/10-scale-bitmap-fonts.conf +++ b/conf.d/10-scale-bitmap-fonts.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Bitmap scaling</description> <!-- If font is bitmap, calculate scale factor. diff --git a/conf.d/10-sub-pixel-bgr.conf b/conf.d/10-sub-pixel-bgr.conf index 4bd14bf..3039b13 100644 --- a/conf.d/10-sub-pixel-bgr.conf +++ b/conf.d/10-sub-pixel-bgr.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Enable sub-pixel rendering with the BGR stripes layout</description> <!-- Enable sub-pixel rendering --> <match target="pattern"> diff --git a/conf.d/10-sub-pixel-rgb.conf b/conf.d/10-sub-pixel-rgb.conf index b3f097b..2a7f238 100644 --- a/conf.d/10-sub-pixel-rgb.conf +++ b/conf.d/10-sub-pixel-rgb.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Enable sub-pixel rendering with the RGB stripes layout</description> <!-- Enable sub-pixel rendering --> <match target="pattern"> diff --git a/conf.d/10-sub-pixel-vbgr.conf b/conf.d/10-sub-pixel-vbgr.conf index e81f061..03cd602 100644 --- a/conf.d/10-sub-pixel-vbgr.conf +++ b/conf.d/10-sub-pixel-vbgr.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Enable sub-pixel rendering with the vertical BGR stripes layout</description> <!-- Enable sub-pixel rendering --> <match target="pattern"> diff --git a/conf.d/10-sub-pixel-vrgb.conf b/conf.d/10-sub-pixel-vrgb.conf index bf82f86..3d52562 100644 --- a/conf.d/10-sub-pixel-vrgb.conf +++ b/conf.d/10-sub-pixel-vrgb.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Enable sub-pixel rendering with the vertical RGB stripes layout</description> <!-- Enable sub-pixel rendering --> <match target="pattern"> diff --git a/conf.d/10-unhinted.conf b/conf.d/10-unhinted.conf index 141be79..3744cd5 100644 --- a/conf.d/10-unhinted.conf +++ b/conf.d/10-unhinted.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Disable hinting</description> <!-- Disable hinting --> <match target="pattern"> diff --git a/conf.d/11-lcdfilter-default.conf b/conf.d/11-lcdfilter-default.conf index d0f9d2e..41dd9a2 100644 --- a/conf.d/11-lcdfilter-default.conf +++ b/conf.d/11-lcdfilter-default.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Use lcddefault as default for LCD filter</description> <!-- Use lcddefault as default for LCD filter --> <match target="pattern"> diff --git a/conf.d/11-lcdfilter-legacy.conf b/conf.d/11-lcdfilter-legacy.conf index 6a446bf..f78032a 100644 --- a/conf.d/11-lcdfilter-legacy.conf +++ b/conf.d/11-lcdfilter-legacy.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Use lcdlegacy as default for LCD filter</description> <!-- Use lcdlegacy as default for LCD filter --> <match target="pattern"> diff --git a/conf.d/11-lcdfilter-light.conf b/conf.d/11-lcdfilter-light.conf index 5818c4d..adb6086 100644 --- a/conf.d/11-lcdfilter-light.conf +++ b/conf.d/11-lcdfilter-light.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Use lcdlight as default for LCD filter</description> <!-- Use lcdlight as default for LCD filter --> <match target="pattern"> diff --git a/conf.d/20-unhint-small-vera.conf b/conf.d/20-unhint-small-vera.conf index 091c299..e4e9c33 100644 --- a/conf.d/20-unhint-small-vera.conf +++ b/conf.d/20-unhint-small-vera.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Disable hinting for Bitstream Vera fonts when the size is less than 8ppem</description> <!-- The Bitstream Vera fonts have GASP entries suggesting that hinting be diff --git a/conf.d/25-unhint-nonlatin.conf b/conf.d/25-unhint-nonlatin.conf index d70dfa1..2fb002f 100644 --- a/conf.d/25-unhint-nonlatin.conf +++ b/conf.d/25-unhint-nonlatin.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Disable hinting for CJK fonts</description> <!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. --> diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf index 527a87f..85b4304 100644 --- a/conf.d/30-metric-aliases.conf +++ b/conf.d/30-metric-aliases.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set substitutions for similar/metric-compatible families</description> <!-- diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf index 86612bc..f8d96ce 100644 --- a/conf.d/40-nonlatin.conf +++ b/conf.d/40-nonlatin.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set substitutions for non-Latin fonts</description> <!-- Mark common families with their generics so we'll get diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf index abd2b5b..5c1bd36 100644 --- a/conf.d/45-generic.conf +++ b/conf.d/45-generic.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set substitutions for emoji/math fonts</description> <!-- Keep in sync with 60-generic.conf --> diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf index be8a613..363e55e 100644 --- a/conf.d/45-latin.conf +++ b/conf.d/45-latin.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set substitutions for Latin fonts</description> <!-- Mark common families with their generics so we'll get diff --git a/conf.d/49-sansserif.conf b/conf.d/49-sansserif.conf index 33577b4..6cc3a1c 100644 --- a/conf.d/49-sansserif.conf +++ b/conf.d/49-sansserif.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Add sans-serif to the family when no generic name</description> <!-- If the font still has no generic name, add sans-serif diff --git a/conf.d/50-user.conf b/conf.d/50-user.conf index bfb1fb6..d019f4d 100644 --- a/conf.d/50-user.conf +++ b/conf.d/50-user.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Load per-user customization files</description> <!-- Load per-user customization files where stored on XDG Base Directory diff --git a/conf.d/51-local.conf b/conf.d/51-local.conf index 1130466..82e3c1b 100644 --- a/conf.d/51-local.conf +++ b/conf.d/51-local.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Load local customization file</description> <!-- Load local system customization file --> <include ignore_missing="yes">local.conf</include> diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf index e9dc783..7831507 100644 --- a/conf.d/60-generic.conf +++ b/conf.d/60-generic.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set preferable fonts for emoji/math fonts</description> <!-- Keep in sync with 45-generic.conf --> diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf index cdc64a8..acdca25 100644 --- a/conf.d/60-latin.conf +++ b/conf.d/60-latin.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set preferable fonts for Latin</description> <alias> <family>serif</family> diff --git a/conf.d/65-fonts-persian.conf b/conf.d/65-fonts-persian.conf index 0837f85..47da1bb 100644 --- a/conf.d/65-fonts-persian.conf +++ b/conf.d/65-fonts-persian.conf @@ -31,11 +31,6 @@ 2008 Behdad Esfahbod: Cleanup. Add fantasy and cursive. --> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - - <!-- Deprecated fonts are discouraged --> diff --git a/conf.d/65-khmer.conf b/conf.d/65-khmer.conf index 249f032..b3d47d6 100644 --- a/conf.d/65-khmer.conf +++ b/conf.d/65-khmer.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <alias> <family>serif</family> <prefer> diff --git a/conf.d/65-nonlatin.conf b/conf.d/65-nonlatin.conf index d85fb2d..4d135b0 100644 --- a/conf.d/65-nonlatin.conf +++ b/conf.d/65-nonlatin.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Set preferable fonts for non-Latin</description> <alias> <family>serif</family> diff --git a/conf.d/69-unifont.conf b/conf.d/69-unifont.conf index 0f04686..02854ff 100644 --- a/conf.d/69-unifont.conf +++ b/conf.d/69-unifont.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <alias> <family>serif</family> <prefer> diff --git a/conf.d/70-no-bitmaps.conf b/conf.d/70-no-bitmaps.conf index 6651d83..3cde490 100644 --- a/conf.d/70-no-bitmaps.conf +++ b/conf.d/70-no-bitmaps.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Reject bitmap fonts</description> <!-- Reject bitmap fonts --> <selectfont> diff --git a/conf.d/70-yes-bitmaps.conf b/conf.d/70-yes-bitmaps.conf index 93cfbca..272b292 100644 --- a/conf.d/70-yes-bitmaps.conf +++ b/conf.d/70-yes-bitmaps.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <description>Accept bitmap fonts</description> <!-- Accept bitmap fonts --> <selectfont> diff --git a/conf.d/80-delicious.conf b/conf.d/80-delicious.conf index 3db2ab9..d20990c 100644 --- a/conf.d/80-delicious.conf +++ b/conf.d/80-delicious.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <!-- Fix-ups for Delicious family --> <!-- Delicious 'heavy' variant says its Medium weight --> diff --git a/conf.d/90-synthetic.conf b/conf.d/90-synthetic.conf index 2935c38..dfce674 100644 --- a/conf.d/90-synthetic.conf +++ b/conf.d/90-synthetic.conf @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> <fontconfig> - <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"> - <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/> - </its:rules> - <!-- Artificial oblique for fonts without an italic or oblique version --> diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am index f8a9503..54bdb20 100644 --- a/fc-lang/Makefile.am +++ b/fc-lang/Makefile.am @@ -290,7 +290,9 @@ BUILT_SOURCES += $(top_builddir)/conf.d/35-lang-normalize.conf DISTCLEANFILES = $(BUILT_SOURCES) $(top_builddir)/conf.d/35-lang-normalize.conf: $(ORTH) Makefile - $(AM_V_GEN) echo "<fontconfig>" > $@ && \ + $(AM_V_GEN) echo "<?xml version=\"1.0\"?>" > $@ && \ + echo "<!DOCTYPE fontconfig SYSTEM \"urn:fontconfig:fonts.dtd\">" >> $@ && \ + echo "<fontconfig>" >> $@ && \ for i in `echo $(ORTH) | sed -e 's/ /\n/g' | grep -v _ | sed -e 's/\.orth$$//g' | sort`; do \ echo " <!-- $$i* -> $$i -->" >> $@; \ echo " <match>" >> $@; \ _______________________________________________ Fontconfig mailing list Fontconfig@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/fontconfig