chiark / gitweb /
Permit new foundry names to contain "."s.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 24 Apr 2016 23:13:06 +0000 (00:13 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 24 Apr 2016 23:13:06 +0000 (00:13 +0100)
debian/changelog
update-xfonts-traditional

index 642e634..5530d04 100644 (file)
@@ -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
 
index 895be6d..51ab164 100755 (executable)
@@ -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;