Convert miscellaneous description elements to texidoc items.

[lilypond.git] / python / musicexp.py

diff --git a/python/musicexp.py b/python/musicexp.py
index a0b13efcc6bb2ebfa7dc4c2a4f5e9a92230f280b..0efd7c54b4b641b20de919a2f747d64225161017 100644 (file)
--- a/python/musicexp.py
+++ b/python/musicexp.py
@@ -57,8 +57,8 @@ class Output_printer(object):
     def set_file (self, file):
         self._file = file
 
-    def dump_version (self):
-        self.print_verbatim ('\\version "2.19.15"')
+    def dump_version (self, version):
+        self.print_verbatim ('\\version "' + version + '"')
         self.newline ()
 
     def get_indent (self):
@@ -826,8 +826,9 @@ class Header:
 
         # If a header item contains a line break, it is segmented. The
         # substrings are formatted with the help of \markup, using
-        # \column and \line.
-        if '\n' in value:
+        # \column and \line. An exception, however, are texidoc items,
+        # which should not contain LilyPond formatting commands.
+        if (key != 'texidoc') and ('\n' in value):
             value = value.replace('"', '')
             printer.dump(r'\markup \column {')
             substrings = value.split('\n')
@@ -847,18 +848,6 @@ class Header:
             if v:
                self.format_header_strings(k, v, printer)
         #printer.newline()
-        printer.dump(r'tagline = \markup {')
-        printer.newline()
-        printer.dump(r'  \center-column {')
-        printer.newline()
-        printer.dump('\line {"Music engraving by LilyPond " $(lilypond-version) | \with-url #"http://www.lilypond.org" {www.lilypond.org}}')
-        printer.newline()
-        printer.dump('\line {\with-url #"https://philomelos.net" {\with-color #grey {Learn, teach and share music on https://philomelos.net}}}')
-        printer.newline()
-        printer.dump('}')
-        printer.newline()
-        printer.dump('}')
-        printer.newline()
         printer.dump("}")
         printer.newline()
         printer.newline()
@@ -1817,7 +1806,7 @@ class KeySignatureChange (Music):
         elif self.non_standard_alterations:
             alterations = [self.format_non_standard_alteration (a) for
                                         a in self.non_standard_alterations]
-            return "\\set Staff.keySignature = #`(%s)" % string.join (alterations, " ")
+            return "\\set Staff.keyAlterations = #`(%s)" % string.join (alterations, " ")
         else:
             return ''