From 9c46ef4aac87c42d013d0e7380b6aeb03e1a9949 Mon Sep 17 00:00:00 2001 From: Nicolas Mailhot Date: Sat, 28 Mar 2020 15:01:35 +0100 Subject: [PATCH] Use an URN for DTD ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit XML tools interpret “fonts.dtd” as a relative path. Unfortunately, that can not work now that the configuration is spread over multiple system-dependant directories, without a common relative path to this file. And, an absolute path can not be defined in a system-independant way. System independance is a requirement to share config files between systems. Therefore, replace the broken relative path by a formal URN, that will work the same way on all systems, without network access. This makes the DTD registerable with commands like: $ xmlcatalog --noout --add system \ "urn:fontconfig:fonts.dtd" \ "file:///usr/share/xml/fontconfig/fonts.dtd" \ /etc/xml/catalog That enables easy config file checking: $ xmllint --loaddtd ${config_file} >/dev/null --- conf.d/05-reset-dirs-sample.conf | 2 +- conf.d/09-autohint-if-no-hinting.conf | 2 +- conf.d/10-autohint.conf | 2 +- conf.d/10-hinting-full.conf | 2 +- conf.d/10-hinting-medium.conf | 2 +- conf.d/10-hinting-none.conf | 2 +- conf.d/10-hinting-slight.conf | 2 +- conf.d/10-no-sub-pixel.conf | 2 +- conf.d/10-scale-bitmap-fonts.conf | 2 +- conf.d/10-sub-pixel-bgr.conf | 2 +- conf.d/10-sub-pixel-rgb.conf | 2 +- conf.d/10-sub-pixel-vbgr.conf | 2 +- conf.d/10-sub-pixel-vrgb.conf | 2 +- conf.d/10-unhinted.conf | 2 +- conf.d/11-lcdfilter-default.conf | 2 +- conf.d/11-lcdfilter-legacy.conf | 2 +- conf.d/11-lcdfilter-light.conf | 2 +- conf.d/20-unhint-small-vera.conf | 2 +- conf.d/25-unhint-nonlatin.conf | 2 +- conf.d/30-metric-aliases.conf | 2 +- conf.d/40-nonlatin.conf | 2 +- conf.d/45-generic.conf | 2 +- conf.d/45-latin.conf | 2 +- conf.d/49-sansserif.conf | 2 +- conf.d/50-user.conf | 2 +- conf.d/51-local.conf | 2 +- conf.d/60-generic.conf | 2 +- conf.d/60-latin.conf | 2 +- conf.d/65-fonts-persian.conf | 2 +- conf.d/65-khmer.conf | 2 +- conf.d/65-nonlatin.conf | 2 +- conf.d/69-unifont.conf | 2 +- conf.d/70-no-bitmaps.conf | 2 +- conf.d/70-yes-bitmaps.conf | 2 +- conf.d/80-delicious.conf | 2 +- conf.d/90-synthetic.conf | 2 +- doc/fontconfig-user.sgml | 6 +++--- fonts.conf.in | 2 +- local.conf | 2 +- 39 files changed, 41 insertions(+), 41 deletions(-) diff --git a/conf.d/05-reset-dirs-sample.conf b/conf.d/05-reset-dirs-sample.conf index 80bb6fb..7e92249 100644 --- a/conf.d/05-reset-dirs-sample.conf +++ b/conf.d/05-reset-dirs-sample.conf @@ -1,5 +1,5 @@ - + Re-define fonts dirs sample diff --git a/conf.d/09-autohint-if-no-hinting.conf b/conf.d/09-autohint-if-no-hinting.conf index afcef3f..5e91ae6 100644 --- a/conf.d/09-autohint-if-no-hinting.conf +++ b/conf.d/09-autohint-if-no-hinting.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-autohint.conf b/conf.d/10-autohint.conf index 50ec3b4..04f4cd4 100644 --- a/conf.d/10-autohint.conf +++ b/conf.d/10-autohint.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-hinting-full.conf b/conf.d/10-hinting-full.conf index aff7976..03e7bb3 100644 --- a/conf.d/10-hinting-full.conf +++ b/conf.d/10-hinting-full.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-hinting-medium.conf b/conf.d/10-hinting-medium.conf index 1d49f3a..83d5f95 100644 --- a/conf.d/10-hinting-medium.conf +++ b/conf.d/10-hinting-medium.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-hinting-none.conf b/conf.d/10-hinting-none.conf index a134ed8..876d135 100644 --- a/conf.d/10-hinting-none.conf +++ b/conf.d/10-hinting-none.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-hinting-slight.conf b/conf.d/10-hinting-slight.conf index f00bcd3..c9e4ef7 100644 --- a/conf.d/10-hinting-slight.conf +++ b/conf.d/10-hinting-slight.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-no-sub-pixel.conf b/conf.d/10-no-sub-pixel.conf index 4fd1776..a266442 100644 --- a/conf.d/10-no-sub-pixel.conf +++ b/conf.d/10-no-sub-pixel.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-scale-bitmap-fonts.conf b/conf.d/10-scale-bitmap-fonts.conf index ebb6c7b..db563d0 100644 --- a/conf.d/10-scale-bitmap-fonts.conf +++ b/conf.d/10-scale-bitmap-fonts.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-sub-pixel-bgr.conf b/conf.d/10-sub-pixel-bgr.conf index 241e589..4bd14bf 100644 --- a/conf.d/10-sub-pixel-bgr.conf +++ b/conf.d/10-sub-pixel-bgr.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-sub-pixel-rgb.conf b/conf.d/10-sub-pixel-rgb.conf index 1cb103d..b3f097b 100644 --- a/conf.d/10-sub-pixel-rgb.conf +++ b/conf.d/10-sub-pixel-rgb.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-sub-pixel-vbgr.conf b/conf.d/10-sub-pixel-vbgr.conf index 1a0690a..e81f061 100644 --- a/conf.d/10-sub-pixel-vbgr.conf +++ b/conf.d/10-sub-pixel-vbgr.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-sub-pixel-vrgb.conf b/conf.d/10-sub-pixel-vrgb.conf index 61bc663..bf82f86 100644 --- a/conf.d/10-sub-pixel-vrgb.conf +++ b/conf.d/10-sub-pixel-vrgb.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/10-unhinted.conf b/conf.d/10-unhinted.conf index f92df0c..141be79 100644 --- a/conf.d/10-unhinted.conf +++ b/conf.d/10-unhinted.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/11-lcdfilter-default.conf b/conf.d/11-lcdfilter-default.conf index 929caaa..d0f9d2e 100644 --- a/conf.d/11-lcdfilter-default.conf +++ b/conf.d/11-lcdfilter-default.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/11-lcdfilter-legacy.conf b/conf.d/11-lcdfilter-legacy.conf index 25c3635..6a446bf 100644 --- a/conf.d/11-lcdfilter-legacy.conf +++ b/conf.d/11-lcdfilter-legacy.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/11-lcdfilter-light.conf b/conf.d/11-lcdfilter-light.conf index 6f1eb3d..5818c4d 100644 --- a/conf.d/11-lcdfilter-light.conf +++ b/conf.d/11-lcdfilter-light.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/20-unhint-small-vera.conf b/conf.d/20-unhint-small-vera.conf index 7b3d7bd..091c299 100644 --- a/conf.d/20-unhint-small-vera.conf +++ b/conf.d/20-unhint-small-vera.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/25-unhint-nonlatin.conf b/conf.d/25-unhint-nonlatin.conf index 78cc7a3..d70dfa1 100644 --- a/conf.d/25-unhint-nonlatin.conf +++ b/conf.d/25-unhint-nonlatin.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf index 147fde6..527a87f 100644 --- a/conf.d/30-metric-aliases.conf +++ b/conf.d/30-metric-aliases.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/40-nonlatin.conf b/conf.d/40-nonlatin.conf index 19cb103..86612bc 100644 --- a/conf.d/40-nonlatin.conf +++ b/conf.d/40-nonlatin.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf index 26f2abd..abd2b5b 100644 --- a/conf.d/45-generic.conf +++ b/conf.d/45-generic.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/45-latin.conf b/conf.d/45-latin.conf index a33420e..be8a613 100644 --- a/conf.d/45-latin.conf +++ b/conf.d/45-latin.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/49-sansserif.conf b/conf.d/49-sansserif.conf index 8b587b0..33577b4 100644 --- a/conf.d/49-sansserif.conf +++ b/conf.d/49-sansserif.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/50-user.conf b/conf.d/50-user.conf index 681ed6d..bfb1fb6 100644 --- a/conf.d/50-user.conf +++ b/conf.d/50-user.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/51-local.conf b/conf.d/51-local.conf index 885c357..1130466 100644 --- a/conf.d/51-local.conf +++ b/conf.d/51-local.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf index 072dddb..e9dc783 100644 --- a/conf.d/60-generic.conf +++ b/conf.d/60-generic.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/60-latin.conf b/conf.d/60-latin.conf index 8ba894e..cdc64a8 100644 --- a/conf.d/60-latin.conf +++ b/conf.d/60-latin.conf @@ -1,5 +1,5 @@ - + diff --git a/conf.d/65-fonts-persian.conf b/conf.d/65-fonts-persian.conf index 5591486..0837f85 100644 --- a/conf.d/65-fonts-persian.conf +++ b/conf.d/65-fonts-persian.conf @@ -1,5 +1,5 @@ - + diff --git a/local.conf b/local.conf index 047ca62..9520e10 100644 --- a/local.conf +++ b/local.conf @@ -1,5 +1,5 @@ - +