Permit new foundry names to contain "."s.

diff --git a/debian/changelog b/debian/changelog
index 642e63401514936e45ebca5af1e62e4be6f5f5d9..5530d040e4b0b3b66c3506ff541a22fee1fba08a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xfonts-traditional (1.7.2~~iwj) UNRELEASED; urgency=medium
   * mkrules can consume .bdf.direct, or .sfd files.
   * An internal error message in printrule is improved slightly.
   * Add debhelper-build-stamp to .gitignore.
+  * Permit new foundry names to contain "."s.
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 24 Apr 2016 22:07:21 +0100
 

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 895be6d5671bcda3db31455eccac0c2da3373572..51ab164d4d942dbb3c2fe2c405659ae1e520e8e4 100755 (executable)
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -160,7 +160,7 @@ sub loadfoundries () {
        while (<$f>) {
            s/^\s*//; s/\s+$//;
            next if m/^\#/;
-           m/^(\w+)\s+(\w+)$/ or die;
+           m/^([.0-9A-Za-z]+)\s+([.0-9A-Za-z]+)$/ or die;
            my $k = lc $1;
            next if exists $foundrymap{$k};
            $foundrymap{$k}=$2;