diff options
| -rw-r--r-- | Build/source/texk/tetex/ChangeLog | 5 | ||||
| -rwxr-xr-x | Master/bin/i386-linux/updmap | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 869d45986ef..d342549f602 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,8 @@ +2006-11-14 Karl Berry <karl@tug.org> + + * updmap (normalizeLines): remove CR characters (for skaknew), so + that the generted map files have consistent line endings for svn. + 2006-07-13 Karl Berry <karl@tug.org> * ps4pdf (tmpdir): don't lose check for TMPDIR and TEMP which te diff --git a/Master/bin/i386-linux/updmap b/Master/bin/i386-linux/updmap index c66303fdeee..ced046f76b9 100755 --- a/Master/bin/i386-linux/updmap +++ b/Master/bin/i386-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 } ############################################################################### |