From: John Gourlay <john@weathervanefarm.net>
Date: Wed, 23 Mar 2016 02:00:27 +0000 (-0400)
Subject: Convert miscellaneous description elements to texidoc items.
X-Git-Tag: release/2.19.44-1~24^2~12
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=1f6e0e7a473c909c5577cba57d93e5a1c6f9f975

Convert miscellaneous description elements to texidoc items.
---

diff --git a/python/musicexp.py b/python/musicexp.py
index 8997b1674c..0efd7c54b4 100644
--- a/python/musicexp.py
+++ b/python/musicexp.py
@@ -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')
diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py
index 0990ff124b..172f1a8d3e 100644
--- a/scripts/musicxml2ly.py
+++ b/scripts/musicxml2ly.py
@@ -229,7 +229,10 @@ def extract_score_information(tree):
         set_if_exists('encoder', ids.get_encoding_person())
         set_if_exists('encodingdescription', ids.get_encoding_description())
         set_if_exists('source', ids.get_source())
-        set_if_exists('miscellaneous', ids.get_file_description());
+
+        # <miscellaneous><miscellaneous-field name="description"> ... becomes
+        # \header { texidoc = ...
+        set_if_exists('texidoc', ids.get_file_description());
 
         # Finally, apply the required compatibility modes
         # Some applications created wrong MusicXML files, so we need to