X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=e08126fcf74461b4f538ce2d811179a6fbd61569;hb=cc24fb904390aaf7d011791e42eb7da020bb2b58;hp=116d5a07ca1e5346754f38f4e26002fe57aad2fb;hpb=68e7fa2aba04babc482a6789b9665b9ef75b33df;p=lilypond.git
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 116d5a07ca..e08126fcf7 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1,38 +1,40 @@
-#!@PYTHON@
+#!@TARGET_PYTHON@
'''
Example usage:
test:
- lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK
+ lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK
convert-ly on book:
- lilypond-book --filter="convert-ly --no-version --from=1.6.11 -" BOOK
+ lilypond-book --filter="convert-ly --no-version --from=1.6.11 -" BOOK
classic lilypond-book:
- lilypond-book --process="lilypond" BOOK.tely
+ lilypond-book --process="lilypond" BOOK.tely
TODO:
- * this script is too complex. Modularize.
-
- * ly-options: intertext?
- * --linewidth?
- * eps in latex / eps by lilypond -b ps?
- * check latex parameters, twocolumn, multicolumn?
- * use --png --ps --pdf for making images?
+ * this script is too complex. Modularize.
+
+ * ly-options: intertext?
+ * --line-width?
+ * eps in latex / eps by lilypond -b ps?
+ * check latex parameters, twocolumn, multicolumn?
+ * use --png --ps --pdf for making images?
- * Converting from lilypond-book source, substitute:
- @mbinclude foo.itely -> @include foo.itely
- \mbinput -> \input
+ * Converting from lilypond-book source, substitute:
+ @mbinclude foo.itely -> @include foo.itely
+ \mbinput -> \input
'''
-import __main__
-import glob
import stat
import string
import tempfile
+import commands
+import os
+import sys
+import re
# Users of python modules should include this snippet
# and customize variables below.
@@ -42,84 +44,156 @@ import tempfile
# If set, LILYPONDPREFIX must take prevalence.
# if datadir is not set, we're doing a build and LILYPONDPREFIX.
-import getopt, os, sys
+
+################
+# RELOCATION
+################
+
datadir = '@local_lilypond_datadir@'
if not os.path.isdir (datadir):
- datadir = '@lilypond_datadir@'
-if os.environ.has_key ('LILYPONDPREFIX'):
- datadir = os.environ['LILYPONDPREFIX']
- while datadir[-1] == os.sep:
- datadir= datadir[:-1]
+ datadir = '@lilypond_datadir@'
+
+sys.path.insert (0, os.path.join (datadir, 'python'))
+if os.environ.has_key ('LILYPONDPREFIX'):
+ datadir = os.environ['LILYPONDPREFIX']
+ while datadir[-1] == os.sep:
+ datadir= datadir[:-1]
+
+ datadir = os.path.join (datadir, "share/lilypond/current/")
sys.path.insert (0, os.path.join (datadir, 'python'))
-# Customize these.
-#if __name__ == '__main__':
+# dynamic relocation, for GUB binaries.
+bindir = os.path.split (sys.argv[0])[0]
+
+
+for prefix_component in ['share', 'lib']:
+ datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % prefix_component)
+ sys.path.insert (0, datadir)
+
import lilylib as ly
import fontextract
global _;_=ly._
-global re;re = ly.re
+
# Lilylib globals.
program_version = '@TOPLEVEL_VERSION@'
program_name = os.path.basename (sys.argv[0])
-verbose_p = 0
-pseudo_filter_p = 0
+
original_dir = os.getcwd ()
backend = 'ps'
help_summary = _ (
'''Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.
+
Example usage:
- lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK
- lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" BOOK
- lilypond-book --process='lilypond -I include' BOOK
+ lilypond-book --filter="tr '[a-z]' '[A-Z]'" BOOK
+ lilypond-book --filter="convert-ly --no-version --from=2.0.0 -" BOOK
+ lilypond-book --process='lilypond -I include' BOOK
''')
-copyright = ('Jan Nieuwenhuizen .*?)
- />)''',
-
- 'lilypond_block':
- r'''(?msx)
- (?P
.*?)
-
)
- \s)''',
-
- 'singleline_comment':
- no_match,
-
- 'verb':
- r'''(?x)
- (?P
.*?
))''',
-
- 'verbatim':
- r'''(?x)
- (?s)
- (?P\s.*?
\s))''',
- },
-
- ##
- LATEX: {
- 'include':
- r'''(?smx)
- ^[^%\n]*?
- (?P.*?)
- })''',
-
- 'lilypond_block':
- r'''(?smx)
- ^[^%\n]*?
- (?P
.*?)
- ^[^%\n]*?
- \\end\s*{lilypond})''',
-
- 'lilypond_file':
- r'''(?smx)
- ^[^%\n]*?
- (?P
- %.*$\n+))''',
-
- 'verb':
- r'''(?mx)
- ^[^%\n]*?
- (?P
- \\verb(?P
.)
- .*?
- (?P=del)))''',
-
- 'verbatim':
- r'''(?msx)
- ^[^%\n]*?
- (?P
- \\begin\s*{verbatim}
- .*?
- \\end\s*{verbatim}))''',
- },
-
- ##
- TEXINFO: {
- 'include':
- r'''(?mx)
- ^(?P
.*?)
- })''',
-
- 'lilypond_block':
- r'''(?msx)
- ^(?P
.*?)
- ^@end\s+lilypond)\s''',
-
- 'lilypond_file':
- r'''(?mx)
- ^(?P
- @ignore\s
- .*?
- @end\s+ignore))\s''',
-
- 'singleline_comment':
- r'''(?mx)
- ^.*
- (?P
- @c([ \t][^\n]*|)\n))''',
-
- # Don't do this: It interferes with @code{@{}.
- # 'verb': r'''(?P
@code{.*?})''',
-
- 'verbatim':
- r'''(?sx)
- (?P
- @example
- \s.*?
- @end\s+example\s))''',
- },
+ ##
+ HTML: {
+ 'include':
+ no_match,
+
+ 'lilypond':
+ r'''(?mx)
+ (?P
.*?)
+ />)''',
+
+ 'lilypond_block':
+ r'''(?msx)
+ (?P
.*?)
+
)
+ \s)''',
+
+ 'singleline_comment':
+ no_match,
+
+ 'verb':
+ r'''(?x)
+ (?P
.*?
))''',
+
+ 'verbatim':
+ r'''(?x)
+ (?s)
+ (?P\s.*?
\s))''',
+ },
+
+ ##
+ LATEX: {
+ 'include':
+ r'''(?smx)
+ ^[^%\n]*?
+ (?P.*?)
+ })''',
+
+ 'lilypond_block':
+ r'''(?smx)
+ ^[^%\n]*?
+ (?P
.*?)
+ ^[^%\n]*?
+ \\end\s*{lilypond})''',
+
+ 'lilypond_file':
+ r'''(?smx)
+ ^[^%\n]*?
+ (?P
+ %.*$\n+))''',
+
+ 'verb':
+ r'''(?mx)
+ ^[^%\n]*?
+ (?P
+ \\verb(?P
.)
+ .*?
+ (?P=del)))''',
+
+ 'verbatim':
+ r'''(?msx)
+ ^[^%\n]*?
+ (?P
+ \\begin\s*{verbatim}
+ .*?
+ \\end\s*{verbatim}))''',
+ },
+
+ ##
+ TEXINFO: {
+ 'include':
+ r'''(?mx)
+ ^(?P
.*?)
+ })''',
+
+ 'lilypond_block':
+ r'''(?msx)
+ ^(?P
.*?)
+ ^@end\s+lilypond)\s''',
+
+ 'lilypond_file':
+ r'''(?mx)
+ ^(?P
+ @ignore\s
+ .*?
+ @end\s+ignore))\s''',
+
+ 'singleline_comment':
+ r'''(?mx)
+ ^.*
+ (?P
+ @c([ \t][^\n]*|)\n))''',
+
+ # Don't do this: It interferes with @code{@{}.
+ # 'verb': r'''(?P
@code{.*?})''',
+
+ 'verbatim':
+ r'''(?sx)
+ (?P
+ @example
+ \s.*?
+ @end\s+example\s))''',
+ },
}
+
+
+
format_res = {
- HTML: {
- 'intertext': r',?\s*intertext=\".*?\"',
- 'option_sep': '\s*',
- },
-
- LATEX: {
- 'intertext': r',?\s*intertext=\".*?\"',
- 'option_sep': '\s*,\s*',
- },
-
- TEXINFO: {
- 'intertext': r',?\s*intertext=\".*?\"',
- 'option_sep': '\s*,\s*',
- },
+ HTML: {
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*',
+ },
+
+ LATEX: {
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*,\s*',
+ },
+
+ TEXINFO: {
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*,\s*',
+ },
}
# Options without a pattern in ly_options.
simple_options = [
- EXAMPLEINDENT,
- FRAGMENT,
- NOFRAGMENT,
- NOINDENT,
- PRINTFILENAME,
- TEXIDOC,
- VERBATIM,
- FONTLOAD,
- FILENAME,
- ALT
+ EXAMPLEINDENT,
+ FRAGMENT,
+ NOFRAGMENT,
+ NOINDENT,
+ PRINTFILENAME,
+ TEXIDOC,
+ VERBATIM,
+ FONTLOAD,
+ FILENAME,
+ ALT
]
ly_options = {
- ##
- NOTES: {
- RELATIVE: r'''\relative c%(relative_quotes)s''',
- },
-
- ##
- PAPER: {
- INDENT: r'''indent = %(indent)s''',
-
- LINEWIDTH: r'''linewidth = %(linewidth)s''',
-
- QUOTE: r'''linewidth = %(linewidth)s - 2.0 * %(exampleindent)s''',
-
- RAGGEDRIGHT: r'''raggedright = ##t''',
-
- PACKED: r'''packed = ##t''',
- },
-
- ##
- LAYOUT: {
- NOTIME: r'''
- \context {
- \Score
- timing = ##f
- }
- \context {
- \Staff
- \remove Time_signature_engraver
- }''',
- },
-
- ##
- PREAMBLE: {
- STAFFSIZE: r'''#(set-global-staff-size %(staffsize)s)''',
- },
+ ##
+ NOTES: {
+ RELATIVE: r'''\relative c%(relative_quotes)s''',
+ },
+
+ ##
+ PAPER: {
+ INDENT: r'''indent = %(indent)s''',
+
+ LINE_WIDTH: r'''line-width = %(line-width)s''',
+
+ QUOTE: r'''line-width = %(line-width)s - 2.0 * %(exampleindent)s''',
+
+ RAGGED_RIGHT: r'''ragged-right = ##t''',
+
+ PACKED: r'''packed = ##t''',
+ },
+
+ ##
+ LAYOUT: {
+ NOTIME: r'''
+ \context {
+ \Score
+ timing = ##f
+ }
+ \context {
+ \Staff
+ \remove Time_signature_engraver
+ }''',
+ },
+
+ ##
+ PREAMBLE: {
+ STAFFSIZE: r'''#(set-global-staff-size %(staffsize)s)''',
+ },
}
output = {
- ##
- HTML: {
- FILTER: r'''
- ''',
+ BEFORE: r'''
+ ''',
- OUTPUT: r'''
- ''',
+ OUTPUT: r'''
+
''',
- PRINTFILENAME: '',
+ PRINTFILENAME: '',
- QUOTE: r'''
+ QUOTE: r'''
%(str)s
''',
- VERBATIM: r'''
+ VERBATIM: r'''
%(verb)s
''',
- },
-
- ##
- LATEX: {
- OUTPUT: r'''{%%
-\parindent 0pt
-\catcode`\@=12
-\ifx\preLilyPondExample \undefined
- \relax
-\else
- \preLilyPondExample
-\fi
+ },
+
+ ##
+ LATEX: {
+ OUTPUT: r'''{%%
+\parindent 0pt%%
+\catcode`\@=12%%
+\ifx\preLilyPondExample \undefined%%
+ \relax%%
+\else%%
+ \preLilyPondExample%%
+\fi%%
\def\lilypondbook{}%%
-\input %(base)s-systems.tex
-\ifx\postLilyPondExample \undefined
- \relax
-\else
- \postLilyPondExample
-\fi
+\input %(base)s-systems.tex%%
+\ifx\postLilyPondExample \undefined%%
+ \relax%%
+\else%%
+ \postLilyPondExample%%
+\fi%%
}''',
- PRINTFILENAME: '''\\texttt{%(filename)s}
- ''',
+ PRINTFILENAME: '''\\texttt{%(filename)s}
+ ''',
- QUOTE: r'''\begin{quotation}
-%(str)s
-\end{quotation}
-''',
+ QUOTE: r'''\begin{quotation}%(str)s
+\end{quotation}''',
- VERBATIM: r'''\noindent
-\begin{verbatim}
-%(verb)s\end{verbatim}
-''',
+ VERBATIM: r'''\noindent
+\begin{verbatim}%(verb)s\end{verbatim}''',
- FILTER: r'''\begin{lilypond}[%(options)s]
+ FILTER: r'''\begin{lilypond}[%(options)s]
%(code)s
\end{lilypond}''',
- },
+ },
- ##
- TEXINFO: {
- FILTER: r'''@lilypond[%(options)s]
+ ##
+ TEXINFO: {
+ FILTER: r'''@lilypond[%(options)s]
%(code)s
@lilypond''',
- OUTPUT: r'''
+ OUTPUT: r'''
@iftex
@include %(base)s-systems.texi
@end iftex
''',
- OUTPUTIMAGE: r'''@noindent
+ OUTPUTIMAGE: r'''@noindent
@ifinfo
@image{%(base)s,,,%(alt)s,%(ext)s}
@end ifinfo
@html
@end html
''',
- PRINTFILENAME: '''@file{%(filename)s}
- ''',
+ PRINTFILENAME: '''
+@html
+
+@end html
+@file{%(filename)s}
+@html
+
+@end html
+ ''',
- QUOTE: r'''@quotation
+ QUOTE: r'''@quotation
%(str)s@end quotation
''',
- NOQUOTE: r'''@format
+ NOQUOTE: r'''@format
%(str)s@end format
''',
- VERBATIM: r'''@exampleindent 0
-@example
-%(verb)s@end example
+ VERBATIM: r'''@exampleindent 0
+@verbatim
+%(verb)s@end verbatim
''',
- },
+ },
}
-PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
+#
+# Maintain line numbers.
+#
+
+## TODO
+if 0:
+ for f in [HTML, LATEX]:
+ for s in (QUOTE, VERBATIM):
+ output[f][s] = output[f][s].replace("\n"," ")
+
+
+PREAMBLE_LY = '''%%%% Generated by %(program_name)s
%%%% Options: [%(option_string)s]
#(set! toplevel-score-handler print-score-with-defaults)
-#(set! toplevel-music-handler (lambda (p m)
- (print-score-with-defaults
- p (scorify-music m p))))
+#(set! toplevel-music-handler
+ (lambda (p m)
+ (if (not (eq? (ly:music-property m \'void) #t))
+ (print-score-with-defaults
+ p (scorify-music m p)))))
#(ly:set-option (quote no-point-and-click))
-
+#(define inside-lilypond-book #t)
#(define version-seen? #t)
%(preamble_string)s
-%% ********************************
+
+
+
+
+%% ****************************************************************
%% Start cut-&-pastable-section
-%% ********************************
+%% ****************************************************************
\paper {
- #(define dump-extents #t)
- %(font_dump_setting)s
- %(paper_string)s
+ #(define dump-extents #t)
+ %(font_dump_setting)s
+ %(paper_string)s
}
\layout {
- %(layout_string)s
+ %(layout_string)s
}
'''
FRAGMENT_LY = r'''
%(notes_string)s
{
+
+
+%% ****************************************************************
%% ly snippet contents follows:
+%% ****************************************************************
%(code)s
+
+
+%% ****************************************************************
%% end ly snippet
+%% ****************************************************************
}
'''
FULL_LY = '''
+
+
+%% ****************************************************************
%% ly snippet:
+%% ****************************************************************
%(code)s
+
+
+%% ****************************************************************
%% end ly snippet
+%% ****************************************************************
'''
-texinfo_linewidths = {
- '@afourpaper': '160\\mm',
- '@afourwide': '6.5\\in',
- '@afourlatex': '150\\mm',
- '@smallbook': '5\\in',
- '@letterpaper': '6\\in',
+texinfo_line_widths = {
+ '@afourpaper': '160\\mm',
+ '@afourwide': '6.5\\in',
+ '@afourlatex': '150\\mm',
+ '@smallbook': '5\\in',
+ '@letterpaper': '6\\in',
}
def classic_lilypond_book_compatibility (key, value):
- if key == 'singleline' and value == None:
- return (RAGGEDRIGHT, None)
+ if key == 'singleline' and value == None:
+ return (RAGGED_RIGHT, None)
- m = re.search ('relative\s*([-0-9])', key)
- if m:
- return ('relative', m.group (1))
+ m = re.search ('relative\s*([-0-9])', key)
+ if m:
+ return ('relative', m.group (1))
- m = re.match ('([0-9]+)pt', key)
- if m:
- return ('staffsize', m.group (1))
+ m = re.match ('([0-9]+)pt', key)
+ if m:
+ return ('staffsize', m.group (1))
- if key == 'indent' or key == 'linewidth':
- m = re.match ('([-.0-9]+)(cm|in|mm|pt|staffspace)', value)
- if m:
- f = float (m.group (1))
- return (key, '%f\\%s' % (f, m.group (2)))
+ if key == 'indent' or key == 'line-width':
+ m = re.match ('([-.0-9]+)(cm|in|mm|pt|staffspace)', value)
+ if m:
+ f = float (m.group (1))
+ return (key, '%f\\%s' % (f, m.group (2)))
- return (None, None)
+ return (None, None)
def find_file (name):
- for i in include_path:
- full = os.path.join (i, name)
- if os.path.exists (full):
- return full
- ly.error (_ ("file not found: %s") % name + '\n')
- ly.exit (1)
- return ''
+ for i in global_options.include_path:
+ full = os.path.join (i, name)
+ if os.path.exists (full):
+ return full
+
+ error (_ ("file not found: %s") % name + '\n')
+ exit (1)
+ return ''
def verbatim_html (s):
- return re.sub ('>', '>',
- re.sub ('<', '<',
- re.sub ('&', '&', s)))
-
-def verbatim_texinfo (s):
- return re.sub ('{', '@{',
- re.sub ('}', '@}',
- re.sub ('@', '@@', s)))
+ return re.sub ('>', '>',
+ re.sub ('<', '<',
+ re.sub ('&', '&', s)))
def split_options (option_string):
- if option_string:
- if format == HTML:
- options = re.findall('[\w\.-:]+(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|\S+))?',option_string)
- for i in range(len(options)):
- options[i] = re.sub('^([^=]+=\s*)(?P["\'])(.*)(?P=q)','\g<1>\g<3>',options[i])
- return options
- else:
- return re.split (format_res[format]['option_sep'],
- option_string)
- return []
-
-def invokes_lilypond ():
- return re.search ('^[\'\"0-9A-Za-z/]*lilypond', process_cmd)
+ if option_string:
+ if global_options.format == HTML:
+ options = re.findall('[\w\.-:]+(?:\s*=\s*(?:"[^"]*"|\'[^\']*\'|\S+))?',option_string)
+ for i in range(len(options)):
+ options[i] = re.sub('^([^=]+=\s*)(?P
["\'])(.*)(?P=q)','\g<1>\g<3>',options[i])
+ return options
+ else:
+ return re.split (format_res[global_options.format]['option_sep'],
+ option_string)
+ return []
def set_default_options (source):
- global default_ly_options
- if not default_ly_options.has_key (LINEWIDTH):
- if format == LATEX:
- textwidth = get_latex_textwidth (source)
- default_ly_options[LINEWIDTH] = \
- '''%.0f\\pt''' % textwidth
- elif format == TEXINFO:
- for (k, v) in texinfo_linewidths.items ():
- # FIXME: @layout is usually not in
- # chunk #0:
- #
- # \input texinfo @c -*-texinfo-*-
- #
- # Bluntly search first K items of
- # source.
- # s = chunks[0].replacement_text ()
- if re.search (k, source[:1024]):
- default_ly_options[LINEWIDTH] = v
- break
+ global default_ly_options
+ if not default_ly_options.has_key (LINE_WIDTH):
+ if global_options.format == LATEX:
+ textwidth = get_latex_textwidth (source)
+ default_ly_options[LINE_WIDTH] = \
+ '''%.0f\\pt''' % textwidth
+ elif global_options.format == TEXINFO:
+ for (k, v) in texinfo_line_widths.items ():
+ # FIXME: @layout is usually not in
+ # chunk #0:
+ #
+ # \input texinfo @c -*-texinfo-*-
+ #
+ # Bluntly search first K items of
+ # source.
+ # s = chunks[0].replacement_text ()
+ if re.search (k, source[:1024]):
+ default_ly_options[LINE_WIDTH] = v
+ break
class Chunk:
- def replacement_text (self):
- return ''
+ def replacement_text (self):
+ return ''
- def filter_text (self):
- return self.replacement_text ()
+ def filter_text (self):
+ return self.replacement_text ()
- def ly_is_outdated (self):
- return 0
+ def ly_is_outdated (self):
+ return 0
- def png_is_outdated (self):
- return 0
+ def png_is_outdated (self):
+ return 0
+ def is_plain (self):
+ return False
+
class Substring (Chunk):
- def __init__ (self, source, start, end, line_number):
- self.source = source
- self.start = start
- self.end = end
- self.line_number = line_number
-
- def replacement_text (self):
- return self.source[self.start:self.end]
+ def __init__ (self, source, start, end, line_number):
+ self.source = source
+ self.start = start
+ self.end = end
+ self.line_number = line_number
+ self.override_text = None
+
+ def is_plain (self):
+ return True
+
+ def replacement_text (self):
+ if self.override_text:
+ return self.override_text
+ else:
+ return self.source[self.start:self.end]
class Snippet (Chunk):
- def __init__ (self, type, match, format, line_number):
- self.type = type
- self.match = match
- self.hash = 0
- self.option_dict = {}
- self.format = format
- self.line_number = line_number
+ def __init__ (self, type, match, format, line_number):
+ self.type = type
+ self.match = match
+ self.hash = 0
+ self.option_dict = {}
+ self.format = format
+ self.line_number = line_number
- def replacement_text (self):
- return self.match.group ('match')
+ def replacement_text (self):
+ return self.match.group ('match')
- def substring (self, s):
- return self.match.group (s)
+ def substring (self, s):
+ return self.match.group (s)
- def __repr__ (self):
- return `self.__class__` + ' type = ' + self.type
+ def __repr__ (self):
+ return `self.__class__` + ' type = ' + self.type
class Include_snippet (Snippet):
- def processed_filename (self):
- f = self.substring ('filename')
- return os.path.splitext (f)[0] + format2ext[format]
+ def processed_filename (self):
+ f = self.substring ('filename')
+ return os.path.splitext (f)[0] + format2ext[global_options.format]
- def replacement_text (self):
- s = self.match.group ('match')
- f = self.substring ('filename')
+ def replacement_text (self):
+ s = self.match.group ('match')
+ f = self.substring ('filename')
- return re.sub (f, self.processed_filename (), s)
+ return re.sub (f, self.processed_filename (), s)
class Lilypond_snippet (Snippet):
- def __init__ (self, type, match, format, line_number):
- Snippet.__init__ (self, type, match, format, line_number)
- os = match.group ('options')
- self.do_options (os, self.type)
-
- def ly (self):
- return self.substring ('code')
-
- def full_ly (self):
- s = self.ly ()
- if s:
- return self.compose_ly (s)
- return ''
-
- def do_options (self, option_string, type):
- self.option_dict = {}
-
- options = split_options (option_string)
-
- for i in options:
- if string.find (i, '=') > 0:
- (key, value) = re.split ('\s*=\s*', i)
- self.option_dict[key] = value
- else:
- if i in no_options.keys ():
- if no_options[i] in self.option_dict.keys ():
- del self.option_dict[no_options[i]]
- else:
- self.option_dict[i] = None
-
- has_linewidth = self.option_dict.has_key (LINEWIDTH)
- no_linewidth_value = 0
-
- # If LINEWIDTH is used without parameter, set it to default.
- if has_linewidth and self.option_dict[LINEWIDTH] == None:
- no_linewidth_value = 1
- del self.option_dict[LINEWIDTH]
-
- for i in default_ly_options.keys ():
- if i not in self.option_dict.keys ():
- self.option_dict[i] = default_ly_options[i]
-
- if not has_linewidth:
- if type == 'lilypond' or FRAGMENT in self.option_dict.keys ():
- self.option_dict[RAGGEDRIGHT] = None
-
- if type == 'lilypond':
- if LINEWIDTH in self.option_dict.keys ():
- del self.option_dict[LINEWIDTH]
- else:
- if RAGGEDRIGHT in self.option_dict.keys ():
- if LINEWIDTH in self.option_dict.keys ():
- del self.option_dict[LINEWIDTH]
-
- if QUOTE in self.option_dict.keys () or type == 'lilypond':
- if LINEWIDTH in self.option_dict.keys ():
- del self.option_dict[LINEWIDTH]
-
- if not INDENT in self.option_dict.keys ():
- self.option_dict[INDENT] = '0\\mm'
-
- # The QUOTE pattern from ly_options only emits the `linewidth'
- # keyword.
- if has_linewidth and QUOTE in self.option_dict.keys ():
- if no_linewidth_value:
- del self.option_dict[LINEWIDTH]
- else:
- del self.option_dict[QUOTE]
-
- def compose_ly (self, code):
- if FRAGMENT in self.option_dict.keys ():
- body = FRAGMENT_LY
- else:
- body = FULL_LY
-
- # Defaults.
- relative = 1
- override = {}
- # The original concept of the `exampleindent' option is broken.
- # It is not possible to get a sane value for @exampleindent at all
- # without processing the document itself. Saying
- #
- # @exampleindent 0
- # @example
- # ...
- # @end example
- # @exampleindent 5
- #
- # causes ugly results with the DVI backend of texinfo since the
- # default value for @exampleindent isn't 5em but 0.4in (or a smaller
- # value). Executing the above code changes the environment
- # indentation to an unknown value because we don't know the amount
- # of 1em in advance since it is font-dependent. Modifying
- # @exampleindent in the middle of a document is simply not
- # supported within texinfo.
- #
- # As a consequence, the only function of @exampleindent is now to
- # specify the amount of indentation for the `quote' option.
- #
- # To set @exampleindent locally to zero, we use the @format
- # environment for non-quoted snippets.
- override[EXAMPLEINDENT] = r'0.4\in'
- override[LINEWIDTH] = texinfo_linewidths['@smallbook']
- override.update (default_ly_options)
-
- option_list = []
- for (key, value) in self.option_dict.items ():
- if value == None:
- option_list.append (key)
- else:
- option_list.append (key + '=' + value)
- option_string = string.join (option_list, ',')
-
- compose_dict = {}
- compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER]
- for a in compose_types:
- compose_dict[a] = []
-
- for (key, value) in self.option_dict.items ():
- (c_key, c_value) = \
- classic_lilypond_book_compatibility (key, value)
- if c_key:
- if c_value:
- ly.warning \
- (_ ("deprecated ly-option used: %s=%s" \
- % (key, value)))
- ly.warning \
- (_ ("compatibility mode translation: %s=%s" \
- % (c_key, c_value)))
- else:
- ly.warning \
- (_ ("deprecated ly-option used: %s" \
- % key))
- ly.warning \
- (_ ("compatibility mode translation: %s" \
- % c_key))
-
- (key, value) = (c_key, c_value)
-
- if value:
- override[key] = value
- else:
- if not override.has_key (key):
- override[key] = None
-
- found = 0
- for type in compose_types:
- if ly_options[type].has_key (key):
- compose_dict[type].append (ly_options[type][key])
- found = 1
- break
-
- if not found and key not in simple_options:
- ly.warning (_ ("ignoring unknown ly option: %s") % key)
-
- # URGS
- if RELATIVE in override.keys () and override[RELATIVE]:
- relative = string.atoi (override[RELATIVE])
-
- relative_quotes = ''
-
- # 1 = central C
- if relative < 0:
- relative_quotes += ',' * (- relative)
- elif relative > 0:
- relative_quotes += "'" * relative
-
- program_name = __main__.program_name
-
- paper_string = string.join (compose_dict[PAPER],
- '\n ') % override
- layout_string = string.join (compose_dict[LAYOUT],
- '\n ') % override
- notes_string = string.join (compose_dict[NOTES],
- '\n ') % vars ()
- preamble_string = string.join (compose_dict[PREAMBLE],
- '\n ') % override
-
- font_dump_setting = ''
- if FONTLOAD in self.option_dict:
- font_dump_setting = '#(define-public force-eps-font-include #t)\n'
-
- return (PREAMBLE_LY + body) % vars ()
-
- # TODO: Use md5?
- def get_hash (self):
- if not self.hash:
- self.hash = abs (hash (self.full_ly ()))
- return self.hash
-
- def basename (self):
- if FILENAME in self.option_dict:
- return self.option_dict[FILENAME]
- if use_hash_p:
- return 'lily-%d' % self.get_hash ()
- raise 'to be done'
-
- def write_ly (self):
- outf = open (self.basename () + '.ly', 'w')
- outf.write (self.full_ly ())
-
- open (self.basename () + '.txt', 'w').write ('image of music')
-
- def ly_is_outdated (self):
- base = self.basename ()
-
- tex_file = '%s.tex' % base
- eps_file = '%s.eps' % base
- system_file = '%s-systems.tex' % base
- ly_file = '%s.ly' % base
- ok = os.path.exists (ly_file) \
- and os.path.exists (system_file)\
- and os.stat (system_file)[stat.ST_SIZE] \
- and re.match ('% eof', open (system_file).readlines ()[-1])
- if ok and (not use_hash_p or FILENAME in self.option_dict):
- ok = (self.full_ly () == open (ly_file).read ())
- if ok:
- # TODO: Do something smart with target formats
- # (ps, png) and m/ctimes.
- return None
- return self
-
- def png_is_outdated (self):
- base = self.basename ()
- ok = self.ly_is_outdated ()
- if format == HTML or format == TEXINFO:
- ok = ok and (os.path.exists (base + '.png')
- or glob.glob (base + '-page*.png'))
- return not ok
- def texstr_is_outdated (self):
- if backend == 'ps':
- return 0
-
- base = self.basename ()
- ok = self.ly_is_outdated ()
- ok = ok and (os.path.exists (base + '.texstr'))
- return not ok
-
- def filter_text (self):
- code = self.substring ('code')
- s = run_filter (code)
- d = {
- 'code': s,
- 'options': self.match.group ('options')
- }
- # TODO
- return output[self.format][FILTER] % d
-
- def replacement_text (self):
- func = Lilypond_snippet.__dict__['output_' + self.format]
- return func (self)
-
- def get_images (self):
- base = self.basename ()
- # URGUGHUGHUGUGH
- single = '%(base)s.png' % vars ()
- multiple = '%(base)s-page1.png' % vars ()
- images = (single,)
- if os.path.exists (multiple) \
- and (not os.path.exists (single) \
- or (os.stat (multiple)[stat.ST_MTIME] \
- > os.stat (single)[stat.ST_MTIME])):
- images = glob.glob ('%(base)s-page*.png' % vars ())
- return images
-
- def output_html (self):
- str = ''
- base = self.basename ()
- if format == HTML:
- str += self.output_print_filename (HTML)
- if VERBATIM in self.option_dict:
- verb = verbatim_html (self.substring ('code'))
- str += write (output[HTML][VERBATIM] % vars ())
- if QUOTE in self.option_dict:
- str = output[HTML][QUOTE] % vars ()
-
- str += output[HTML][BEFORE] % vars ()
- for image in self.get_images ():
- (base, ext) = os.path.splitext (image)
- alt = self.option_dict[ALT]
- str += output[HTML][OUTPUT] % vars ()
- str += output[HTML][AFTER] % vars ()
- return str
-
- def output_info (self):
- str = ''
- for image in self.get_images ():
- (base, ext) = os.path.splitext (image)
-
- # URG, makeinfo implicitly prepends dot to extension.
- # Specifying no extension is most robust.
- ext = ''
- alt = self.option_dict[ALT]
- str += output[TEXINFO][OUTPUTIMAGE] % vars ()
-
- base = self.basename ()
- str += output[format][OUTPUT] % vars ()
- return str
-
- def output_latex (self):
- str = ''
- base = self.basename ()
- if format == LATEX:
- str += self.output_print_filename (LATEX)
- if VERBATIM in self.option_dict:
- verb = self.substring ('code')
- str += (output[LATEX][VERBATIM] % vars ())
- if QUOTE in self.option_dict:
- str = output[LATEX][QUOTE] % vars ()
-
- str += (output[LATEX][OUTPUT] % vars ())
- return str
-
- def output_print_filename (self, format):
- str = ''
- if PRINTFILENAME in self.option_dict:
- base = self.basename ()
- filename = self.substring ('filename')
- str = output[format][PRINTFILENAME] % vars ()
-
- return str
-
- def output_texinfo (self):
- str = ''
- if self.output_print_filename (TEXINFO):
- str += ('@html\n'
- + self.output_print_filename (HTML)
- + '\n@end html\n')
- str += ('@tex\n'
- + self.output_print_filename (LATEX)
- + '\n@end tex\n')
- base = self.basename ()
- if TEXIDOC in self.option_dict:
- texidoc = base + '.texidoc'
- if os.path.exists (texidoc):
- str += '@include %(texidoc)s\n\n' % vars ()
-
- if VERBATIM in self.option_dict:
- verb = verbatim_texinfo (self.substring ('code'))
- str += (output[TEXINFO][VERBATIM] % vars ())
- if not QUOTE in self.option_dict:
- str = output[TEXINFO][NOQUOTE] % vars ()
-
- str += self.output_info ()
-
-# str += ('@ifinfo\n' + self.output_info () + '\n@end ifinfo\n')
-# str += ('@tex\n' + self.output_latex () + '\n@end tex\n')
-# str += ('@html\n' + self.output_html () + '\n@end html\n')
-
- if QUOTE in self.option_dict:
- str = output[TEXINFO][QUOTE] % vars ()
-
- # need par after image
- str += '\n'
-
- return str
+ def __init__ (self, type, match, format, line_number):
+ Snippet.__init__ (self, type, match, format, line_number)
+ os = match.group ('options')
+ self.do_options (os, self.type)
+
+ def ly (self):
+ return self.substring ('code')
+
+ def full_ly (self):
+ s = self.ly ()
+ if s:
+ return self.compose_ly (s)
+ return ''
+
+ def do_options (self, option_string, type):
+ self.option_dict = {}
+
+ options = split_options (option_string)
+
+ for i in options:
+ if string.find (i, '=') > 0:
+ (key, value) = re.split ('\s*=\s*', i)
+ self.option_dict[key] = value
+ else:
+ if i in no_options.keys ():
+ if no_options[i] in self.option_dict.keys ():
+ del self.option_dict[no_options[i]]
+ else:
+ self.option_dict[i] = None
+
+ has_line_width = self.option_dict.has_key (LINE_WIDTH)
+ no_line_width_value = 0
+
+ # If LINE_WIDTH is used without parameter, set it to default.
+ if has_line_width and self.option_dict[LINE_WIDTH] == None:
+ no_line_width_value = 1
+ del self.option_dict[LINE_WIDTH]
+
+ for i in default_ly_options.keys ():
+ if i not in self.option_dict.keys ():
+ self.option_dict[i] = default_ly_options[i]
+
+ if not has_line_width:
+ if type == 'lilypond' or FRAGMENT in self.option_dict.keys ():
+ self.option_dict[RAGGED_RIGHT] = None
+
+ if type == 'lilypond':
+ if LINE_WIDTH in self.option_dict.keys ():
+ del self.option_dict[LINE_WIDTH]
+ else:
+ if RAGGED_RIGHT in self.option_dict.keys ():
+ if LINE_WIDTH in self.option_dict.keys ():
+ del self.option_dict[LINE_WIDTH]
+
+ if QUOTE in self.option_dict.keys () or type == 'lilypond':
+ if LINE_WIDTH in self.option_dict.keys ():
+ del self.option_dict[LINE_WIDTH]
+
+ if not INDENT in self.option_dict.keys ():
+ self.option_dict[INDENT] = '0\\mm'
+
+ # The QUOTE pattern from ly_options only emits the `line-width'
+ # keyword.
+ if has_line_width and QUOTE in self.option_dict.keys ():
+ if no_line_width_value:
+ del self.option_dict[LINE_WIDTH]
+ else:
+ del self.option_dict[QUOTE]
+
+ def compose_ly (self, code):
+ if FRAGMENT in self.option_dict.keys ():
+ body = FRAGMENT_LY
+ else:
+ body = FULL_LY
+
+ # Defaults.
+ relative = 1
+ override = {}
+ # The original concept of the `exampleindent' option is broken.
+ # It is not possible to get a sane value for @exampleindent at all
+ # without processing the document itself. Saying
+ #
+ # @exampleindent 0
+ # @example
+ # ...
+ # @end example
+ # @exampleindent 5
+ #
+ # causes ugly results with the DVI backend of texinfo since the
+ # default value for @exampleindent isn't 5em but 0.4in (or a smaller
+ # value). Executing the above code changes the environment
+ # indentation to an unknown value because we don't know the amount
+ # of 1em in advance since it is font-dependent. Modifying
+ # @exampleindent in the middle of a document is simply not
+ # supported within texinfo.
+ #
+ # As a consequence, the only function of @exampleindent is now to
+ # specify the amount of indentation for the `quote' option.
+ #
+ # To set @exampleindent locally to zero, we use the @format
+ # environment for non-quoted snippets.
+ override[EXAMPLEINDENT] = r'0.4\in'
+ override[LINE_WIDTH] = texinfo_line_widths['@smallbook']
+ override.update (default_ly_options)
+
+ option_list = []
+ for (key, value) in self.option_dict.items ():
+ if value == None:
+ option_list.append (key)
+ else:
+ option_list.append (key + '=' + value)
+ option_string = string.join (option_list, ',')
+
+ compose_dict = {}
+ compose_types = [NOTES, PREAMBLE, LAYOUT, PAPER]
+ for a in compose_types:
+ compose_dict[a] = []
+
+ for (key, value) in self.option_dict.items ():
+ (c_key, c_value) = \
+ classic_lilypond_book_compatibility (key, value)
+ if c_key:
+ if c_value:
+ warning \
+ (_ ("deprecated ly-option used: %s=%s" \
+ % (key, value)))
+ warning \
+ (_ ("compatibility mode translation: %s=%s" \
+ % (c_key, c_value)))
+ else:
+ warning \
+ (_ ("deprecated ly-option used: %s" \
+ % key))
+ warning \
+ (_ ("compatibility mode translation: %s" \
+ % c_key))
+
+ (key, value) = (c_key, c_value)
+
+ if value:
+ override[key] = value
+ else:
+ if not override.has_key (key):
+ override[key] = None
+
+ found = 0
+ for type in compose_types:
+ if ly_options[type].has_key (key):
+ compose_dict[type].append (ly_options[type][key])
+ found = 1
+ break
+
+ if not found and key not in simple_options:
+ warning (_ ("ignoring unknown ly option: %s") % key)
+
+ # URGS
+ if RELATIVE in override.keys () and override[RELATIVE]:
+ relative = int (override[RELATIVE])
+
+ relative_quotes = ''
+
+ # 1 = central C
+ if relative < 0:
+ relative_quotes += ',' * (- relative)
+ elif relative > 0:
+ relative_quotes += "'" * relative
+
+ paper_string = string.join (compose_dict[PAPER],
+ '\n ') % override
+ layout_string = string.join (compose_dict[LAYOUT],
+ '\n ') % override
+ notes_string = string.join (compose_dict[NOTES],
+ '\n ') % vars ()
+ preamble_string = string.join (compose_dict[PREAMBLE],
+ '\n ') % override
+
+ font_dump_setting = ''
+ if FONTLOAD in self.option_dict:
+ font_dump_setting = '#(define-public force-eps-font-include #t)\n'
+
+ d = globals().copy()
+ d.update (locals())
+ return (PREAMBLE_LY + body) % d
+
+ # TODO: Use md5?
+ def get_hash (self):
+ if not self.hash:
+ self.hash = abs (hash (self.full_ly ()))
+ return self.hash
+
+ def basename (self):
+ if FILENAME in self.option_dict:
+ return self.option_dict[FILENAME]
+ if global_options.use_hash:
+ return 'lily-%d' % self.get_hash ()
+ raise 'to be done'
+
+ def write_ly (self):
+ outf = open (self.basename () + '.ly', 'w')
+ outf.write (self.full_ly ())
+
+ open (self.basename () + '.txt', 'w').write ('image of music')
+
+ def ly_is_outdated (self):
+ base = self.basename ()
+
+ tex_file = '%s.tex' % base
+ eps_file = '%s.eps' % base
+ system_file = '%s-systems.tex' % base
+ ly_file = '%s.ly' % base
+ ok = os.path.exists (ly_file) \
+ and os.path.exists (system_file)\
+ and os.stat (system_file)[stat.ST_SIZE] \
+ and re.match ('% eof', open (system_file).readlines ()[-1])
+ if ok and (not global_options.use_hash or FILENAME in self.option_dict):
+ ok = (self.full_ly () == open (ly_file).read ())
+ if ok:
+ # TODO: Do something smart with target formats
+ # (ps, png) and m/ctimes.
+ return None
+ return self
+
+ def png_is_outdated (self):
+ base = self.basename ()
+ ok = not self.ly_is_outdated ()
+ if global_options.format in (HTML, TEXINFO):
+ ok = ok and os.path.exists (base + '.eps')
+
+ page_count = 0
+ if ok:
+ page_count = ps_page_count (base + '.eps')
+
+ if page_count <= 1:
+ ok = ok and os.path.exists (base + '.png')
+
+ elif page_count > 1:
+ for a in range (1, page_count + 1):
+ ok = ok and os.path.exists (base + '-page%d.png' % a)
+
+ return not ok
+
+ def texstr_is_outdated (self):
+ if backend == 'ps':
+ return 0
+
+ base = self.basename ()
+ ok = self.ly_is_outdated ()
+ ok = ok and (os.path.exists (base + '.texstr'))
+ return not ok
+
+ def filter_text (self):
+ code = self.substring ('code')
+ s = run_filter (code)
+ d = {
+ 'code': s,
+ 'options': self.match.group ('options')
+ }
+ # TODO
+ return output[self.format][FILTER] % d
+
+ def replacement_text (self):
+ func = Lilypond_snippet.__dict__['output_' + self.format]
+ return func (self)
+
+ def get_images (self):
+ base = self.basename ()
+ # URGUGHUGHUGUGH
+ single = '%(base)s.png' % vars ()
+ multiple = '%(base)s-page1.png' % vars ()
+ images = (single,)
+ if os.path.exists (multiple) \
+ and (not os.path.exists (single) \
+ or (os.stat (multiple)[stat.ST_MTIME] \
+ > os.stat (single)[stat.ST_MTIME])):
+ count = ps_page_count ('%(base)s.eps' % vars ())
+ images = ['%s-page%d.png' % (base, a) for a in range (1, count+1)]
+ images = tuple (images)
+ return images
+
+ def output_html (self):
+ str = ''
+ base = self.basename ()
+ if global_options.format == HTML:
+ str += self.output_print_filename (HTML)
+ if VERBATIM in self.option_dict:
+ verb = verbatim_html (self.substring ('code'))
+ str += output[HTML][VERBATIM] % vars ()
+ if QUOTE in self.option_dict:
+ str = output[HTML][QUOTE] % vars ()
+
+ str += output[HTML][BEFORE] % vars ()
+ for image in self.get_images ():
+ (base, ext) = os.path.splitext (image)
+ alt = self.option_dict[ALT]
+ str += output[HTML][OUTPUT] % vars ()
+ str += output[HTML][AFTER] % vars ()
+ return str
+
+ def output_info (self):
+ str = ''
+ for image in self.get_images ():
+ (base, ext) = os.path.splitext (image)
+
+ # URG, makeinfo implicitly prepends dot to extension.
+ # Specifying no extension is most robust.
+ ext = ''
+ alt = self.option_dict[ALT]
+ str += output[TEXINFO][OUTPUTIMAGE] % vars ()
+
+ base = self.basename ()
+ str += output[global_options.format][OUTPUT] % vars ()
+ return str
+
+ def output_latex (self):
+ str = ''
+ base = self.basename ()
+ if global_options.format == LATEX:
+ str += self.output_print_filename (LATEX)
+ if VERBATIM in self.option_dict:
+ verb = self.substring ('code')
+ str += (output[LATEX][VERBATIM] % vars ())
+
+ str += (output[LATEX][OUTPUT] % vars ())
+
+ ## todo: maintain breaks
+ if 0:
+ breaks = self.ly ().count ("\n")
+ str += "".ljust (breaks, "\n").replace ("\n","%\n")
+
+ if QUOTE in self.option_dict:
+ str = output[LATEX][QUOTE] % vars ()
+ return str
+
+ def output_print_filename (self, format):
+ str = ''
+ if PRINTFILENAME in self.option_dict:
+ base = self.basename ()
+ filename = self.substring ('filename')
+ str = output[global_options.format][PRINTFILENAME] % vars ()
+
+ return str
+
+ def output_texinfo (self):
+ str = ''
+ if self.output_print_filename (TEXINFO):
+ str += ('@html\n'
+ + self.output_print_filename (HTML)
+ + '\n@end html\n')
+ str += ('@tex\n'
+ + self.output_print_filename (LATEX)
+ + '\n@end tex\n')
+ base = self.basename ()
+ if TEXIDOC in self.option_dict:
+ texidoc = base + '.texidoc'
+ if os.path.exists (texidoc):
+ str += '@include %(texidoc)s\n\n' % vars ()
+
+ if VERBATIM in self.option_dict:
+ verb = self.substring ('code')
+ str += (output[TEXINFO][VERBATIM] % vars ())
+ if not QUOTE in self.option_dict:
+ str = output[TEXINFO][NOQUOTE] % vars ()
+
+ str += self.output_info ()
+
+# str += ('@ifinfo\n' + self.output_info () + '\n@end ifinfo\n')
+# str += ('@tex\n' + self.output_latex () + '\n@end tex\n')
+# str += ('@html\n' + self.output_html () + '\n@end html\n')
+
+ if QUOTE in self.option_dict:
+ str = output[TEXINFO][QUOTE] % vars ()
+
+ # need par after image
+ str += '\n'
+
+ return str
class Lilypond_file_snippet (Lilypond_snippet):
- def ly (self):
- name = self.substring ('filename')
- return '\\renameinput \"%s\"\n%s' \
- % (name, open (find_file (name)).read ())
+ def ly (self):
+ name = self.substring ('filename')
+ return '\\sourcefilename \"%s\"\n%s' \
+ % (name, open (find_file (name)).read ())
snippet_type_to_class = {
- 'lilypond_file': Lilypond_file_snippet,
- 'lilypond_block': Lilypond_snippet,
- 'lilypond': Lilypond_snippet,
- 'include': Include_snippet,
+ 'lilypond_file': Lilypond_file_snippet,
+ 'lilypond_block': Lilypond_snippet,
+ 'lilypond': Lilypond_snippet,
+ 'include': Include_snippet,
}
def find_linestarts (s):
- nls = [0]
- start = 0
- end = len (s)
- while 1:
- i = s.find ('\n', start)
- if i < 0:
- break
+ nls = [0]
+ start = 0
+ end = len (s)
+ while 1:
+ i = s.find ('\n', start)
+ if i < 0:
+ break
- i = i + 1
- nls.append (i)
- start = i
+ i = i + 1
+ nls.append (i)
+ start = i
- nls.append (len (s))
- return nls
+ nls.append (len (s))
+ return nls
def find_toplevel_snippets (s, types):
- res = {}
- for i in types:
- res[i] = ly.re.compile (snippet_res[format][i])
-
- snippets = []
- index = 0
- ## found = dict (map (lambda x: (x, None),
- ## types))
- ## urg python2.1
- found = {}
- map (lambda x, f = found: f.setdefault (x, None),
- types)
-
- line_starts = find_linestarts (s)
- line_start_idx = 0
- # We want to search for multiple regexes, without searching
- # the string multiple times for one regex.
- # Hence, we use earlier results to limit the string portion
- # where we search.
- # Since every part of the string is traversed at most once for
- # every type of snippet, this is linear.
-
- while 1:
- first = None
- endex = 1 << 30
- for type in types:
- if not found[type] or found[type][0] < index:
- found[type] = None
- m = res[type].search (s[index:endex])
- if not m:
- continue
-
- cl = Snippet
- if snippet_type_to_class.has_key (type):
- cl = snippet_type_to_class[type]
-
-
- start = index + m.start ('match')
- line_number = line_start_idx
- while (line_starts[line_number] < start):
- line_number += 1
-
- line_number += 1
- snip = cl (type, m, format, line_number)
- found[type] = (start, snip)
-
- if found[type] \
- and (not first \
- or found[type][0] < found[first][0]):
- first = type
-
- # FIXME.
-
- # Limiting the search space is a cute
- # idea, but this *requires* to search
- # for possible containing blocks
- # first, at least as long as we do not
- # search for the start of blocks, but
- # always/directly for the entire
- # @block ... @end block.
-
- endex = found[first][0]
-
- if not first:
- snippets.append (Substring (s, index, len (s), line_start_idx))
- break
-
- while (start > line_starts[line_start_idx+1]):
- line_start_idx += 1
-
- (start, snip) = found[first]
- snippets.append (Substring (s, index, start, line_start_idx + 1))
- snippets.append (snip)
- found[first] = None
- index = start + len (snip.match.group ('match'))
-
- return snippets
+ res = {}
+ for i in types:
+ res[i] = ly.re.compile (snippet_res[global_options.format][i])
+
+ snippets = []
+ index = 0
+ ## found = dict (map (lambda x: (x, None),
+ ## types))
+ ## urg python2.1
+ found = {}
+ map (lambda x, f = found: f.setdefault (x, None),
+ types)
+
+ line_starts = find_linestarts (s)
+ line_start_idx = 0
+ # We want to search for multiple regexes, without searching
+ # the string multiple times for one regex.
+ # Hence, we use earlier results to limit the string portion
+ # where we search.
+ # Since every part of the string is traversed at most once for
+ # every type of snippet, this is linear.
+
+ while 1:
+ first = None
+ endex = 1 << 30
+ for type in types:
+ if not found[type] or found[type][0] < index:
+ found[type] = None
+
+ m = res[type].search (s[index:endex])
+ if not m:
+ continue
+
+ cl = Snippet
+ if snippet_type_to_class.has_key (type):
+ cl = snippet_type_to_class[type]
+
+
+ start = index + m.start ('match')
+ line_number = line_start_idx
+ while (line_starts[line_number] < start):
+ line_number += 1
+
+ line_number += 1
+ snip = cl (type, m, global_options.format, line_number)
+
+ found[type] = (start, snip)
+
+ if found[type] \
+ and (not first \
+ or found[type][0] < found[first][0]):
+ first = type
+
+ # FIXME.
+
+ # Limiting the search space is a cute
+ # idea, but this *requires* to search
+ # for possible containing blocks
+ # first, at least as long as we do not
+ # search for the start of blocks, but
+ # always/directly for the entire
+ # @block ... @end block.
+
+ endex = found[first][0]
+
+ if not first:
+ snippets.append (Substring (s, index, len (s), line_start_idx))
+ break
+
+ while (start > line_starts[line_start_idx+1]):
+ line_start_idx += 1
+
+ (start, snip) = found[first]
+ snippets.append (Substring (s, index, start, line_start_idx + 1))
+ snippets.append (snip)
+ found[first] = None
+ index = start + len (snip.match.group ('match'))
+
+ return snippets
def filter_pipe (input, cmd):
- if verbose_p:
- ly.progress (_ ("Opening filter `%s'") % cmd)
-
- (stdin, stdout, stderr) = os.popen3 (cmd)
- stdin.write (input)
- status = stdin.close ()
-
- if not status:
- status = 0
- output = stdout.read ()
- status = stdout.close ()
- error = stderr.read ()
-
- if not status:
- status = 0
- signal = 0x0f & status
- if status or (not output and error):
- exit_status = status >> 8
- ly.error (_ ("`%s' failed (%d)") % (cmd, exit_status))
- ly.error (_ ("The error log is as follows:"))
- sys.stderr.write (error)
- sys.stderr.write (stderr.read ())
- ly.exit (status)
-
- if verbose_p:
- ly.progress ('\n')
-
- return output
+ if global_options.verbose:
+ progress (_ ("Opening filter `%s'") % cmd)
+
+ (stdin, stdout, stderr) = os.popen3 (cmd)
+ stdin.write (input)
+ status = stdin.close ()
+
+ if not status:
+ status = 0
+ output = stdout.read ()
+ status = stdout.close ()
+ error = stderr.read ()
+
+ if not status:
+ status = 0
+ signal = 0x0f & status
+ if status or (not output and error):
+ exit_status = status >> 8
+ error (_ ("`%s' failed (%d)") % (cmd, exit_status))
+ error (_ ("The error log is as follows:"))
+ sys.stderr.write (error)
+ sys.stderr.write (stderr.read ())
+ exit (status)
+
+ if global_options.verbose:
+ progress ('\n')
+
+ return output
def run_filter (s):
- return filter_pipe (s, filter_cmd)
+ return filter_pipe (s, global_options.filter_cmd)
def is_derived_class (cl, baseclass):
- if cl == baseclass:
- return 1
- for b in cl.__bases__:
- if is_derived_class (b, baseclass):
- return 1
- return 0
+ if cl == baseclass:
+ return 1
+ for b in cl.__bases__:
+ if is_derived_class (b, baseclass):
+ return 1
+ return 0
def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets):
- ly_names = filter (lambda x: x,
- map (Lilypond_snippet.basename, ly_snippets))
- texstr_names = filter (lambda x: x,
- map (Lilypond_snippet.basename, texstr_snippets))
- png_names = filter (lambda x: x,
- map (Lilypond_snippet.basename, png_snippets))
-
- status = 0
- def my_system (cmd):
- status = ly.system (cmd,
- ignore_error = 1, progress_p = 1)
-
- if status:
- ly.error ('Process %s exited unsuccessfully.' % cmd)
- raise Compile_error
-
- # UGH
- # the --process=CMD switch is a bad idea
- # it is too generic for lilypond-book.
- if texstr_names and invokes_lilypond:
- my_system (string.join ([cmd, '--backend texstr',
- 'snippet-map.ly'] + texstr_names))
- for l in texstr_names:
- my_system ('latex %s.texstr' % l)
-
- if ly_names:
- my_system (string.join ([cmd, 'snippet-map.ly'] + ly_names))
-
-LATEX_DOCUMENT = r'''
+ ly_names = filter (lambda x: x,
+ map (Lilypond_snippet.basename, ly_snippets))
+ texstr_names = filter (lambda x: x,
+ map (Lilypond_snippet.basename, texstr_snippets))
+
+ png_names = filter (lambda x: x,
+ map (Lilypond_snippet.basename, png_snippets))
+
+ status = 0
+ def my_system (cmd):
+ status = ly.system (cmd,
+ be_verbose=global_options.verbose,
+ progress_p= 1)
+
+ if global_options.format in (HTML, TEXINFO):
+ cmd += ' --format png '
+
+ # UGH
+ # the --process=CMD switch is a bad idea
+ # it is too generic for lilypond-book.
+ if texstr_names:
+ my_system (string.join ([cmd, '--backend texstr',
+ 'snippet-map.ly'] + texstr_names))
+ for l in texstr_names:
+ my_system ('latex %s.texstr' % l)
+
+ if ly_names:
+ my_system (string.join ([cmd, 'snippet-map.ly'] + ly_names))
+
+LATEX_INSPECTION_DOCUMENT = r'''
+\nonstopmode
%(preamble)s
\begin{document}
\typeout{textwidth=\the\textwidth}
@@ -1274,344 +1414,366 @@ LATEX_DOCUMENT = r'''
# Do we need anything else besides `textwidth'?
def get_latex_textwidth (source):
- m = re.search (r'''(?P