[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 doc/fontconfig-user.sgml |    5 +++++
 fonts.dtd                |   21 ++++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit 2bd559f75d76b514f789e32c5cc9643fd7c1e9a2
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Nov 15 20:55:08 2018 +0900

    Add doc for description element and update fonts.dtd
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/133

diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index 458435f..f23ae36 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -340,6 +340,11 @@ This element provides a place to consolidate additional configuration
 information.  <literal><config></literal> can contain <literal><blank></literal> and <literal><rescan></literal> elements in any
 order.
   </para></refsect2>
+  <refsect2><title><literal><description domain="fontconfig-conf"></literal></title><para>
+This element is supposed to hold strings which describe what a config is used for.
+This string can be translated through gettext. 'domain' needs to be set the proper name to apply then.
+fontconfig will tries to retrieve translations with 'domain' from gettext.
+  </para></refsect2>
   <refsect2><title><literal><blank></literal></title><para>
 Fonts often include "broken" glyphs which appear in the encoding but are
 drawn as blanks on the screen.  Within the <literal><blank></literal> element, place each
diff --git a/fonts.dtd b/fonts.dtd
index fb577ad..2d75682 100644
--- a/fonts.dtd
+++ b/fonts.dtd
@@ -1,12 +1,13 @@
 <!-- This is the Document Type Definition for font configuration files -->
-<!ELEMENT fontconfig (dir | 
+<!ELEMENT fontconfig (alias |
 		      cache | 
 		      cachedir |
-		      include | 
 		      config |
-		      selectfont |
-		      match | 
-		      alias)* >
+		      description |
+		      dir |
+		      include |
+		      match |
+		      selectfont)* >
 
 <!-- 
     Add a directory that provides fonts
@@ -44,6 +45,16 @@
 	  xml:space (default|preserve) 'preserve'>
 
 <!--
+    Set a string as a description for the targeted config file
+
+    Set 'domain' to change where to pull translations from.
+    This will be done through gettext.
+-->
+<!ELEMENT description (#PCDATA)>
+<!ATTLIST description
+	  domain	CDATA	"fontconfig-conf">
+
+<!--
     Reference another configuration file; note that this
     is another complete font configuration file and not
     just a file included by the XML parser.