More. Fixes #1035

diff --git a/share/format.pl b/share/format.pl
index 1f3b6ef73d27cd941014a9a3a362c5de73e0cfdb..a0031d1b49f87829f19702ce3ba4dc76d299e368 100755 (executable)
--- a/share/format.pl
+++ b/share/format.pl
@@ -91,7 +91,7 @@ while (@ARGV) {
        #
        #  Remember if we did begin-vendor.
        #
-       if (/^BEGIN-VENDOR\s+([\w-]+)/) {
+       if (/^BEGIN-VENDOR\s+([-\w]+)/) {
            $begin_vendor = 1;
            if (!defined $vendor) {
                $vendor = $1;
@@ -106,7 +106,7 @@ while (@ARGV) {
        #
        #  Get attribute.
        #
-       if (/^ATTRIBUTE\s+([\w-]+)\s+([\w.]+)\s+(\w+)(.*)/) {
+       if (/^ATTRIBUTE\s+([-\w]+)\s+([\w.]+)\s+(\w+)(.*)/) {
            $name=$1;
            $len = length $name;
            if ($len < 40) {
@@ -146,7 +146,7 @@ while (@ARGV) {
        #
        #  Values.
        #
-       if (/^VALUE\s+([\w-]+)\s+([\w-\/,.]+)\s+(\w+)(.*)/) {
+       if (/^VALUE\s+([-\w]+)\s+([-\w\/,.]+)\s+(\w+)(.*)/) {
            $attr=$1;
            $len = length $attr;
            if ($len < 32) {