nicer code

Author: jwdj

CHANGES

@@ -530,3 +530,9 @@ different panes. Tie/untie option added for notes. Broken rhythm
 - MAC only: a delay was added before playing to fix first notes not being played
 - Added to the Help menu a link to 'ABC Quick Reference Card'
 - after switching to another format file in abc-settings the music score refreshes
+
+1.3.7.7
+- German translation updated (thanks to Bernhard Weichel)
+- Fix for 'Follow score' for notes spanning multiple pages
+- Import midi fixed
+- Fixed: Typing Z: appeared as Z |:

abc2xml.py

@@ -92,7 +92,7 @@ def abc_grammar ():     # header, voice and lyrics grammar for ABC
     syllable    = Combine (Optional ('~') + syl_chars + ZeroOrMore (Literal ('~') + syl_chars)) + Optional ('-')
     lyr_elem    = (syllable | skip_note | extend_note | measure_end) + Optional (white).suppress ()
     lyr_line    = Optional (white).suppress () + ZeroOrMore (lyr_elem)
-    
+
     syllable.setParseAction (lambda t: pObj ('syl', t))
     skip_note.setParseAction (lambda t: pObj ('skip', t))
     extend_note.setParseAction (lambda t: pObj ('ext', t))
@@ -172,7 +172,7 @@ def abc_grammar ():     # header, voice and lyrics grammar for ABC
     bar_left = (oneOf ('[|: |: [: :') + Optional (volta)) | Optional ('|').suppress () + volta | oneOf ('| [|')
     bars = ZeroOrMore (':') + ZeroOrMore ('[') + OneOrMore (oneOf ('| ]'))
     bar_right = invisible_barline | double_rep | Combine (bars) | dashed_barline | voice_overlay | bare_volta
-    
+
     errors =  ~bar_right + Optional (Word (' \n')) + CharsNotIn (':&|', exact=1)
     linebreak = Literal ('$') | ~decorations + Literal ('!')    # no need for I:linebreak !!!
     element = fld_or_lyr | broken | decorations | stem | chord_or_text | grace_notes | tuplet_start | linebreak | errors
@@ -404,7 +404,7 @@ def addElemT (parent, tag, text, level):
     e.text = text
     addElem (parent, e, level)
     return e
-    
+
 def mkTmod (tmnum, tmden, lev):
     tmod = E.Element ('time-modification')
     addElemT (tmod, 'actual-notes', str (tmnum), lev + 1)
@@ -540,7 +540,7 @@ def splitHeaderVoices (abctext):
 def mergeMeasure (m1, m2, slur_offset, voice_offset, rOpt, is_grand=0):
     slurs = m2.findall ('note/notations/slur')
     for slr in slurs:
-        slrnum = int (slr.get ('number')) + slur_offset 
+        slrnum = int (slr.get ('number')) + slur_offset
         slr.set ('number', str (slrnum))    # make unique slurnums in m2
     vs = m2.findall ('note/voice')          # set all voice number elements in m2
     for v in vs: v.text  = str (voice_offset + int (v.text))
@@ -998,7 +998,7 @@ def doNotations (s, n, ptup, alter, tupnotation, tstop, nt, lev):
             slurnum = len (s.slurstack) + 1
             s.slurstack.append (slurnum)
             ntn = E.Element ('slur', number='%d' % slurnum, type='start')
-            addElem (nots, ntn, lev + 1)            
+            addElem (nots, ntn, lev + 1)
         if nots.getchildren() != []:    # only add notations if not empty
             addElem (nt, nots, lev)
 
@@ -1068,7 +1068,7 @@ def stopBeams (s):
         s.prevNote = None
 
     def staffDecos (s, decos, maat, lev):
-        gstaff = s.gStaffNums.get (s.vid, 0)        # staff number of the current voice        
+        gstaff = s.gStaffNums.get (s.vid, 0)        # staff number of the current voice
         for d in decos:
             d = s.usrSyms.get (d, d).strip ('!+')   # try to replace user defined symbol
             if d in s.dynaMap:
@@ -1129,7 +1129,7 @@ def doClef (field):
                 note, octstr = clefm.groups ()
                 nUp = note.upper ()
                 octnum = (4 if nUp == note else 5) + (len (octstr) if "'" in octstr else -len (octstr))
-                gtrans = (3 if nUp in 'AFD' else 4) - octnum 
+                gtrans = (3 if nUp in 'AFD' else 4) - octnum
                 if clef not in ['perc', 'none']: clef = s.clefLineMap [nUp]
             if clef:
                 s.gtrans = gtrans   # only change global tranposition when a clef is really defined
@@ -1711,7 +1711,7 @@ def parse (s, abc_string, rOpt=False):
                 vcelyr = vce
                 elem1 = vcelyr [0][0]   # the first element of the first measure
                 if  elem1.name == 'inline'and elem1.t[0] == 'V':    # is a voice definition
-                    voicedef = elem1 
+                    voicedef = elem1
                     del vcelyr [0][0]   # do not read voicedef twice
                 else:
                     voicedef = ''
@@ -1785,7 +1785,7 @@ def decodeInput (data_string):
     info ('decoded from %s' % enc)
     return unicode_string
 
-xmlVersion = "<?xml version='1.0' encoding='utf-8'?>"    
+xmlVersion = "<?xml version='1.0' encoding='utf-8'?>"
 def fixDoctype (elem):
     if python3: xs = E.tostring (elem, encoding='unicode')  # writing to file will auto-encode to utf-8
     else:       xs = E.tostring (elem, encoding='utf-8')    # keep the string utf-8 encoded for writing to file
@@ -1826,7 +1826,7 @@ def convert (pad, fnm, abc_string, mxl, rOpt):
         outfile = sys.stdout
         outfile.write (xmldoc)
         outfile.write ('\n')
-    
+
 #----------------
 # Main Program
 #----------------

abc_character_encoding.py

@@ -184,7 +184,7 @@ def unicode_text_to_html_abc(text):
 '\\~i': u'\u0129',
 '\\~U': u'\u0168',
 '\\~u': u'\u0169',
-'\\oA': u'\xc5',           
+'\\oA': u'\xc5',
 '\\oa': u'\xe5',
 '\\oU': u'\u016e',
 '\\ou': u'\u016f',
@@ -467,7 +467,7 @@ def unicode_text_to_html_abc(text):
 '\\k,': u'\u0137',
 '"\\u;"': u'\u0173',
 '\\u?': u'\u0169',
-'\\u-': u'\u016b',           
+'\\u-': u'\u016b',
 
 r'{\aa}': u'\xe5',
 r'{\aA}': u'\xc5',}
@@ -477,4 +477,3 @@ def unicode_text_to_html_abc(text):
 
 def decode_abc(abc_code): return encoded_char_re.sub(lambda m: mapping[m.group(0)], abc_code)
 def encode_abc(abc_code): return ''.join(reverse_mapping.get(c, c) for c in abc_code)
-	

abc_search.py

@@ -3,10 +3,10 @@
 all_notes = "| C,, D,, E,, F,, G,, A,, B,, C, D, E, F, G, A, B, C D E F G A B c d e f g a b c' d' e' f' g' a' b' c'' d'' e'' f'' g'' a'' b''".split()
 note2number = dict([(n, i) for (i, n) in enumerate(all_notes)])
 note_pattern = re.compile(r"([ABCDEFG],*|[abcdefg]'*)")
-repl_by_spaces = lambda m: ' ' * len(m.group(0))  
+repl_by_spaces = lambda m: ' ' * len(m.group(0))
 
 remove_non_notes = re.compile(r'(?xm)' + '|'.join([
-               r'\%\%beginps(.|\s)+?\%\%endps',  # remove embedded postscript    
+               r'\%\%beginps(.|\s)+?\%\%endps',  # remove embedded postscript
                r'\%\%begintext(.|\s)+?\%\%endtext',   # remove text
                r'\[\w:.*?\]',    # remove embedded fields
                r'(?m)^\w:.*?$',  # remove normal fields
@@ -22,47 +22,47 @@
                ]))
 
 def remove_non_note_fragments(abc):
-    # replace non-note fragments of the text by replacing them by spaces (thereby preserving offsets), but keep also bar and repeat symbols    
-    return remove_non_notes.sub(repl_by_spaces, abc.replace('\r', '\n'))        
+    # replace non-note fragments of the text by replacing them by spaces (thereby preserving offsets), but keep also bar and repeat symbols
+    return remove_non_notes.sub(repl_by_spaces, abc.replace('\r', '\n'))
 
 def get_intervals_from_abc(abc):
     abc = remove_non_note_fragments(abc)
     notes = [note2number[m] for m in note_pattern.findall(abc)]
     intervals = [i2-i1 for (i1,i2) in zip(notes[:-1], notes[1:])]
     return ''.join([chr(74+i) for i in intervals])
 
-def get_matches(abc, abc_search_intervals):    
+def get_matches(abc, abc_search_intervals):
     abc = remove_non_note_fragments(abc)
     matches = list(note_pattern.finditer(abc))               # the matched notes in the abc
     notes = [note2number[m.group(0)] for m in matches]       # the note number for each note
     offsets = [m.span(0) for m in matches]                   # the start/end offset in the ABC code for each note
     intervals = [i2-i1 for (i1,i2) in zip(notes[:-1], notes[1:])]  # the intervals between pairs of notes
     intervals = ''.join([chr(74+i) for i in intervals])            # the intervals coded as strings
     # find the search string among all the intervals
-    for m in re.finditer(re.escape(abc_search_intervals), intervals):        
-        i = m.start(0)      # the offset in the search string is the same as the index of the note        
+    for m in re.finditer(re.escape(abc_search_intervals), intervals):
+        i = m.start(0)      # the offset in the search string is the same as the index of the note
         start, end = offsets[i][0], offsets[i+len(abc_search_intervals)][1]
         yield (start, end)  # return start and end offset in the ABC code for the matched sequence of notes
 
 def abc_matches_iter(abc, search_string):
-    search = get_intervals_from_abc(search_string)        
+    search = get_intervals_from_abc(search_string)
     offset = 0  # the total character offset from the beginning of the abc text
     tunes = abc.split('X:')  # split the code up per tune
-    
-    for i, tune in enumerate(tunes):        
+
+    for i, tune in enumerate(tunes):
         if i > 0: tune = 'X:' + tune  # add back the X: to the tunes from which it was removed during the split
 
         # find matches
         for start_offset_in_tune, end_offset_in_tune in get_matches(tune, search):
             # convert the offsets within the tune to global offsets
-            start, end = (offset+start_offset_in_tune, offset+end_offset_in_tune)            
+            start, end = (offset+start_offset_in_tune, offset+end_offset_in_tune)
             yield (start, end)
-            
-        offset += len(tune)        
 
-if __name__ == '__main__':                            
-    search = 'CEG'    
-    abc = '''' GE CE GE'''    
+        offset += len(tune)
+
+if __name__ == '__main__':
+    search = 'CEG'
+    abc = '''' GE CE GE'''
 
     for r in abc_matches_iter(abc, search):
         pass

abc_styler.py

@@ -61,7 +61,7 @@ def OnStyleNeeded(self, event):
         get_text_range = editor.GetTextRangeRaw
         set_styling = editor.SetStyling
         start = editor.GetEndStyled()    # this is the first character that needs styling
-        end = event.GetPosition()        # this is the last character that needs styling        
+        end = event.GetPosition()        # this is the last character that needs styling
         line_start = editor.LineFromPosition(start)
         start = editor.PositionFromLine(line_start)
         state = editor.GetStyleAt(start-1)  # init style

abc_tune.py

@@ -82,7 +82,7 @@ def determine_abc_structure(self, abc_code):
         self.tune_body_start_line_index = body_start_line_index
         self.abc_lines = abc_lines
         self.note_line_indices = note_line_indices
-        
+
     def get_abc_per_voice(self):
         if self.__abc_per_voice is None:
             if self.tune_body_start_line_index:
@@ -139,7 +139,7 @@ def is_equal(self, abc_tune):
         return self.x_number == abc_tune.x_number \
                and self.tune_header_start_line_index == abc_tune.tune_header_start_line_index \
                and self.first_note_line_index == abc_tune.first_note_line_index
-    
+
     def is_gracenote_at(self, row, col):
         line = self.abc_lines[row-1]
         i = col - 1
@@ -163,26 +163,26 @@ def get_start_of_chord(self, row, col):
                 return i + 1
             i -= 1
         return None
-    
+
     @staticmethod
     def byte_to_unicode_index(text, index):
         return len(abc_text_to_unicode(text[:index]).encode('utf-8'))
-    
+
     def midi_col_to_svg_col(self, row, col):
         line = self.abc_lines[row-1]
         col = self.byte_to_unicode_index(line, col-1) + 1 # compensate for encoding differences
-        
+
         try:
             if self.is_gracenote_at(row, col):
-                return None # abcm2ps does not mark notes within braces 
-    
-            start_of_chord = self.get_start_of_chord(row, col) 
+                return None # abcm2ps does not mark notes within braces
+
+            start_of_chord = self.get_start_of_chord(row, col)
             if start_of_chord:
                 return start_of_chord - 1 # svg_col is 1-based
-            
+
             if line[col-1] in '~.HIJKLMNOPQRSTUVWhijklmnopqrstuvw':
                 return col # in case of one letter symbol: abc2midi marks the symbol, abcm2ps marks the after note after the dot
-                
+
             return col-1
         except:
             return None