--- scripts/lilypond-book.py~ Thu Aug 30 16:06:11 2001 +++ scripts/lilypond-book.py Thu Sep 6 22:32:28 2001 @@ -418,15 +418,15 @@ re_dict = { 'latex': {'input': r'(?m)^[^%\n]*?(?P\\mbinput{?([^}\t \n}]*))', 'include': r'(?m)^[^%\n]*?(?P\\mbinclude{(?P[^}]+)})', - 'option-sep' : ', *', + 'option-sep' : ',\s*', 'header': r"\\documentclass\s*(\[.*?\])?", 'geometry': r"^(?m)[^%\n]*?\\usepackage\s*(\[(?P.*)\])?\s*{geometry}", 'preamble-end': r'(?P\\begin{document})', 'verbatim': r"(?s)(?P\\begin{verbatim}.*?\\end{verbatim})", 'verb': r"(?P\\verb(?P.).*?(?P=del))", - 'lilypond-file': r'(?m)^[^%\n]*?(?P\\lilypondfile(\[(?P.*?)\])?\{(?P.+)})', - 'lilypond' : r'(?m)^[^%\n]*?(?P\\lilypond(\[(?P.*?)\])?{(?P.*?)})', - 'lilypond-block': r"(?sm)^[^%\n]*?(?P\\begin(\[(?P.*?)\])?{lilypond}(?P.*?)\\end{lilypond})", + 'lilypond-file': r'(?m)^[^%\n]*?(?P\\lilypondfile\s*(\[(?P.*?)\])?\s*\{(?P.+)})', + 'lilypond' : r'(?m)^[^%\n]*?(?P\\lilypond\s*(\[(?P.*?)\])?\s*{(?P.*?)})', + 'lilypond-block': r"(?sm)^[^%\n]*?(?P\\begin\s*(\[(?P.*?)\])?\s*{lilypond}(?P.*?)\\end{lilypond})", 'def-post-re': r"\\def\\postLilypondExample", 'def-pre-re': r"\\def\\preLilypondExample", 'usepackage-graphics': r"\usepackage{graphics}", @@ -449,7 +449,7 @@ 'lilypond-file': '(?m)^(address@hidden)(?P@lilypondfile(\[(?P.*?)\])?{(?P[^}]+)})', 'lilypond' : '(?m)^(address@hidden)(?P@lilypond(\[(?P.*?)\])?{(?P.*?)})', 'lilypond-block': r"""(?m)^(address@hidden)(?P(?s)(?P@lilypond(\[(?P.*?)\])?\s(?P.*?)@end lilypond\s))""", - 'option-sep' : ', *', + 'option-sep' : ',\s*', 'intertext': r',?\s*intertext=\".*?\"', 'multiline-comment': r"(?sm)^\s*(address@hidden)(?P@address@hidden ignore)\s", 'singleline-comment': r"(?m)^.*?(?P(?P@c.*$\n+))", --- scm/interface-description.scm~ Mon Aug 20 23:53:21 2001 +++ scm/interface-description.scm Thu Sep 6 22:35:59 2001 @@ -251,6 +251,7 @@ tuplet-bracket-visibility tuplet-number-visibility thick + direction ))