public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96992 from jtojnar/fc-dtd-urn

Browse Source 
treewide: use URN for fontconfig DTD
This commit is contained in:
Jan Tojnar
2020-09-04 17:12:29 +02:00
committed by GitHub
parent 27b1dd93c9 6dd3b54ccc
commit 7ecabdc22b
10 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/config/fonts/fontconfig.nix
+5 -5
View File
@@ -35,7 +35,7 @@ let
in in
pkgs.writeText "fc-00-nixos-cache.conf" '' pkgs.writeText "fc-00-nixos-cache.conf" ''
<?xml version='1.0'?> <?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig> <fontconfig>
<!-- Font directories --> <!-- Font directories -->
${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)} ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}
@@ -53,7 +53,7 @@ let
# priority 10 # priority 10
renderConf = pkgs.writeText "fc-10-nixos-rendering.conf" '' renderConf = pkgs.writeText "fc-10-nixos-rendering.conf" ''
<?xml version='1.0'?> <?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig> <fontconfig>
<!-- Default rendering settings --> <!-- Default rendering settings -->
@@ -110,7 +110,7 @@ let
in in
pkgs.writeText "fc-52-nixos-default-fonts.conf" '' pkgs.writeText "fc-52-nixos-default-fonts.conf" ''
<?xml version='1.0'?> <?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig> <fontconfig>
<!-- Default fonts --> <!-- Default fonts -->
@@ -129,7 +129,7 @@ let
# priority 53 # priority 53
rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" '' rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" ''
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
${optionalString (!cfg.allowBitmaps) '' ${optionalString (!cfg.allowBitmaps) ''
@@ -157,7 +157,7 @@ let
# priority 53 # priority 53
rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" '' rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
<!-- Reject Type 1 fonts --> <!-- Reject Type 1 fonts -->
pkgs/applications/video/lightworks/default.nix
+1 -1
View File
@@ -47,7 +47,7 @@ let
# This adds it to lightworks' search path while keeping the default # This adds it to lightworks' search path while keeping the default
# using the FONTCONFIG_FILE env variable # using the FONTCONFIG_FILE env variable
echo "<?xml version='1.0'?> echo "<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig> <fontconfig>
<dir>/usr/share/fonts/truetype</dir> <dir>/usr/share/fonts/truetype</dir>
<include>/etc/fonts/fonts.conf</include> <include>/etc/fonts/fonts.conf</include>
pkgs/data/fonts/caladea/cambria-alias.conf
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
<!-- Configure Caladea as a metric-compatible alias for the <!-- Configure Caladea as a metric-compatible alias for the
Microsoft Cambria font family. --> Microsoft Cambria font family. -->
pkgs/data/fonts/carlito/calibri-alias.conf
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
<!-- Configure Carlito as a metric-compatible alias for the <!-- Configure Carlito as a metric-compatible alias for the
Microsoft Calibri font family. --> Microsoft Calibri font family. -->
pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
<!-- Configure Comic Relief as a metric-compatible alias for the <!-- Configure Comic Relief as a metric-compatible alias for the
Microsoft Comic Sans font family. --> Microsoft Comic Sans font family. -->
pkgs/data/fonts/corefonts/no-op.conf
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
<!-- This configuation is intentionally left empty in order to <!-- This configuation is intentionally left empty in order to
override any other font package that may wish to set up an override any other font package that may wish to set up an
pkgs/data/fonts/vista-fonts-chs/no-op.conf
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
<!-- This configuation is intentionally left empty in order to <!-- This configuation is intentionally left empty in order to
override any other font package that may wish to set up an override any other font package that may wish to set up an
pkgs/data/fonts/vista-fonts/no-op.conf
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
<fontconfig> <fontconfig>
<!-- This configuation is intentionally left empty in order to <!-- This configuation is intentionally left empty in order to
override any other font package that may wish to set up an override any other font package that may wish to set up an
pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+1 -1
View File
@@ -16,7 +16,7 @@ runCommand "fc-cache"
cat > fonts.conf << EOF cat > fonts.conf << EOF
<?xml version='1.0'?> <?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
<fontconfig> <fontconfig>
<include>${fontconfig.out}/etc/fonts/fonts.conf</include> <include>${fontconfig.out}/etc/fonts/fonts.conf</include>
<cachedir>$out</cachedir> <cachedir>$out</cachedir>
pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+1 -1
View File
@@ -12,7 +12,7 @@
extension-element-prefixes="str" extension-element-prefixes="str"
> >
<xsl:output method='xml' encoding="UTF-8" doctype-system="fonts.dtd" /> <xsl:output method='xml' encoding="UTF-8" doctype-system="urn:fontconfig:fonts.dtd" />
<xsl:param name="fontDirectories" /> <xsl:param name="fontDirectories" />
<xsl:param name="fontconfig" /> <xsl:param name="fontconfig" />