summaryrefslogtreecommitdiff
path: root/Master/bin/x86_64-linux/updmap
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-07 14:46:38 +0000
committerKarl Berry <karl@freefriends.org>2006-12-07 14:46:38 +0000
commitd2b08350013d261085a892f3a95be72f223e5de8 (patch)
tree112183e64b244643304329230feb859f258df1fd /Master/bin/x86_64-linux/updmap
parentba742ac9d450eafd5d4eb49b220e0b53b13d9590 (diff)
update from tigran
git-svn-id: svn://tug.org/texlive/trunk@2607 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/bin/x86_64-linux/updmap')
-rwxr-xr-xMaster/bin/x86_64-linux/updmap7
1 files changed, 5 insertions, 2 deletions
diff --git a/Master/bin/x86_64-linux/updmap b/Master/bin/x86_64-linux/updmap
index c66303fdeee..ced046f76b9 100755
--- a/Master/bin/x86_64-linux/updmap
+++ b/Master/bin/x86_64-linux/updmap
@@ -1052,7 +1052,8 @@ syncWithTrees()
###############################################################################
# normalizeLines()
# remove comments, whitespace is exactly one space, no empty lines,
-# no whitespace at end of line, one space before and after "
+# no whitespace at end of line, one space before and after ",
+# no CR's (as in skaknew).
###############################################################################
normalizeLines()
{
@@ -1062,7 +1063,9 @@ normalizeLines()
-e '/^ *$/d' \
-e 's@ $@@' \
-e 's@ *" *@ " @g' \
- -e 's@" \([^"]*\) "@"\1"@g' | sort | uniq
+ -e 's@" \([^"]*\) "@"\1"@g' \
+ | tr -d '\r' \
+ | sort | uniq
}
###############################################################################