X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fmidi2ly.py;h=9c490a5f2caf95bd737fee5046878054f69ab364;hb=57817ab4e80df96e604b50a766c23ebabf72fc66;hp=3a29f9aaa1cebe66db1b3c16b770dd7a866b9b58;hpb=00a48501c64c8babe77c2ebabcc42dae33a7c026;p=lilypond.git

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 3a29f9aaa1..9c490a5f2c 100644
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -382,12 +382,21 @@ class Text:
         'INSTRUMENT_NAME',
         'LYRIC',
         'MARKER',
-        'CUE_POINT',)
+        'CUE_POINT',
+        'PROGRAM_NAME',
+        'DEVICE_NAME', )
+
+    @staticmethod
+    def _text_only(chr):
+        if ((' ' <= chr <= '~') or chr in ['\n','\r']):
+            return chr
+        else: 
+            return '~'
 
     def __init__ (self, type, text):
         self.clocks = 0
         self.type = type
-        self.text = text
+        self.text =''.join(map(self._text_only, text))
 
     def dump (self):
         # urg, we should be sure that we're in a lyrics staff