Reviewers: ,
Message:
Please review.
Description:
Some of the snippets imported from the LSR (notably some of the
headwords) have CR LF at the end of their lines. This appears to be
viewed as excess whitespace and stripped when the git repo is updated.
As a result, any import of the LSR flags these snippets as changed.
This simple fix replaces CR LF with LF during the import with makelsr.
This fixes the excess whitespace problem.
Please review this at https://codereview.appspot.com/238520043/
Affected files (+1, -0 lines):
M scripts/auxiliar/makelsr.py
Index: scripts/auxiliar/makelsr.py
diff --git a/scripts/auxiliar/makelsr.py b/scripts/auxiliar/makelsr.py
index
d17fd53c71263e02bfd042f41bc4bbe6f854263d..71c8179f36721a047821e23cd25d9bf20fbe3618
100755
--- a/scripts/auxiliar/makelsr.py
+++ b/scripts/auxiliar/makelsr.py
@@ -251,6 +251,7 @@ def copy_ly (srcdir, name, tags):
s = strip_white_spaces_re.sub ('', s)
s = final_empty_lines_re.sub ('\n', s)
s = escape_backslashes_in_header (s)
+ s = s.replace ("\r\n", "\n")
sys.stderr.write ("makelsr.py: writing %s\n" % dest)
open (dest, 'w').write (s)
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
