Merge remote branch 'origin' into release/unstable

diff --git a/python/book_latex.py b/python/book_latex.py
index 398d88c42c229b728edf9e81866934bf075758c4..591de34eea79f470d1594b8fd8cd7c627ffe2b1e 100644 (file)
--- a/python/book_latex.py
+++ b/python/book_latex.py
@@ -189,7 +189,7 @@ def get_latex_textwidth (source, global_options):
     cmd = '%s %s' % (global_options.latex_program, tmpfile);
     ly.debug_output ("Executing: %s\n" % cmd);
     run_env = os.environ.copy()
-    run_env['LC_ALL:'] = 'C'
+    run_env['LC_ALL'] = 'C'
 
     ### unknown why this is necessary
     universal_newlines = True

diff --git a/python/book_snippets.py b/python/book_snippets.py
index e3fc2eff950ff6034ca41296ea7488ca192f0942..5e6bc4e71eb51cf1b3e3f125a8c90a5e08b0b916 100644 (file)
--- a/python/book_snippets.py
+++ b/python/book_snippets.py
@@ -601,7 +601,7 @@ class LilypondSnippet (Snippet):
             existing = open (filename, 'r').read ()
 
             if self.relevant_contents (existing) != self.relevant_contents (self.full_ly ()):
-                warning ("%s: duplicate filename but different contents of orginal file,\n\
+                warning ("%s: duplicate filename but different contents of original file,\n\
 printing diff against existing file." % filename)
                 ly.stderr_write (self.filter_pipe (self.full_ly (), 'diff -u %s -' % filename))
         else:
@@ -903,7 +903,7 @@ class MusicXMLFileSnippet (LilypondFileSnippet):
         if os.path.exists (xmlfilename):
             diff_against_existing = self.filter_pipe (self.contents, 'diff -u %s - ' % xmlfilename)
             if diff_against_existing:
-                warning (_ ("%s: duplicate filename but different contents of orginal file,\n\
+                warning (_ ("%s: duplicate filename but different contents of original file,\n\
 printing diff against existing file.") % xmlfilename)
                 ly.stderr_write (diff_against_existing)
         else:

diff --git a/python/book_texinfo.py b/python/book_texinfo.py
index 6137f282731cd9d6b23b62ea4cc456983aacda56..ca9ee31754f84dfe6adfd57d510dc2c292577957 100644 (file)
--- a/python/book_texinfo.py
+++ b/python/book_texinfo.py
@@ -209,7 +209,7 @@ def get_texinfo_width_indent (source, global_options):
     cmd = '%s -c -o %s %s' % (global_options.texinfo_program, outfile, tmpfile);
     ly.debug_output ("Executing: %s\n" % cmd);
     run_env = os.environ.copy()
-    run_env['LC_ALL:'] = 'C'
+    run_env['LC_ALL'] = 'C'
 
     ### unknown why this is necessary
     universal_newlines = True