From b478cbc44440e2102fa1c4bab9e47f4f1e8be273 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 25 Apr 2016 00:13:06 +0100 Subject: [PATCH] Permit new foundry names to contain "."s. --- debian/changelog | 1 + update-xfonts-traditional | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 642e634..5530d04 100644 --- 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 Sun, 24 Apr 2016 22:07:21 +0100 diff --git a/update-xfonts-traditional b/update-xfonts-traditional index 895be6d..51ab164 100755 --- 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; -- 2.30.2