X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-book.py;h=d349c29bc3e46fd1497ba820f2ee27ac2810c60c;hb=f4beff9cdba290efe94de240e38a5f2ec19c8388;hp=65efd22671148ac96282e0b4585048811555d56e;hpb=877e08e8618de8a31ba9b299d6bf6a6ceb7ee28d;p=lilypond.git
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 65efd22671..d349c29bc3 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -5,19 +5,23 @@ Example usage:
test:
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
classic lilypond-book:
- lilypond-book --process="lilypond-bin" BOOK.tely
+ lilypond-book --process="lilypond" BOOK.tely
TODO:
- * ly-options: intertext ?
+
+ * this script is too complex. Modularize.
+
+ * ly-options: intertext?
* --linewidth?
- * eps in latex / eps by lilypond-bin -fps ?
+ * 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
@@ -26,434 +30,627 @@ TODO:
import __main__
import glob
-import string
import stat
-################################################################
+import string
+import tempfile
+import commands
+
# Users of python modules should include this snippet
# and customize variables below.
-# We'll suffer this path init stuff as long as we don't install our
-# python packages in .*?)/>)',
- 'lilypond_block': r'''(?ms)(?P
.*?)
)\s",
- 'singleline_comment': no_match,
- 'verb': r'''(?P
.*?
)''',
- 'verbatim': r'''(?s)(?P\s.*?
\s)''',
+ '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'(?m)^[^%\n]*?(?P.*?)})',
- 'lilypond_block': r"(?sm)^[^%\n]*?(?P
.*?)\\end{lilypond})",
- 'lilypond_file': r'(?m)^[^%\n]*?(?P
^%.*$\n+))",
- 'verb': r"(?P
\\verb(?P
.).*?(?P=del))",
- 'verbatim': r"(?s)(?P\\begin\s*{verbatim}.*?\\end{verbatim})",
+ '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': '(?m)^[^%\n]*?(?P
.*?)})',
- 'lilypond_block': r'''(?ms)^(?P
.*?)@end lilypond)\s''',
- 'lilypond_file': '(?m)^(?P
@ignore\s.*?@end\s+ignore)\s',
- 'singleline_comment': r'(?m)^.*(?P
@c([ \t][^\n]*|)\n))',
-
-# don't do this: fucks up with @code{@{}
-# 'verb': r'''(?P
@code{.*?})''',
- 'verbatim': r'''(?s)(?P
@example\s.*?@end\s+example\s)''',
+ '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: {
- 'option-sep' : '\s*',
- 'intertext': r',?\s*intertext=\".*?\"',
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*',
},
+
LATEX: {
- 'intertext': r',?\s*intertext=\".*?\"',
- 'option-sep' : ',\s*',
+ 'intertext': r',?\s*intertext=\".*?\"',
+ 'option_sep': '\s*,\s*',
},
+
TEXINFO: {
- 'intertext': r',?\s*intertext=\".*?\"',
- 'option-sep' : ',\s*',
+ '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
+]
ly_options = {
+ ##
NOTES: {
- RELATIVE: r'''\relative c%(relative_quotes)s''',
+ RELATIVE: r'''\relative c%(relative_quotes)s''',
},
+
+ ##
PAPER: {
- EXAMPLEINDENT : '',
- INDENT : r'''
- indent = %(indent)s''',
- 'linewidth' : r'''
- linewidth = %(linewidth)s''',
- NOINDENT : r'''
- indent = 0.0\mm''',
- NOTIME : r'''
- \context {
- \Staff
- \remove Time_signature_engraver
- }''',
- QUOTE : r'''
- linewidth = %(linewidth)s - 2.0 * %(exampleindent)s
-''',
- RAGGEDRIGHT : r'''
- indent = 0.0\mm
- raggedright = ##t''',
+ 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)''',
+ STAFFSIZE: r'''#(set-global-staff-size %(staffsize)s)''',
},
- }
+}
output = {
- HTML : {
- FILTER: r'''
+ + BEFORE: r'''
''',
- OUTPUT: r'''
+
+ OUTPUT: r'''
''',
- PRINTFILENAME:'',
- QUOTE: r'''
+
+
+
+
+ border="0" src="%(image)s" alt="%(alt)s">''',
+
+ PRINTFILENAME: '',
+
+ QUOTE: r'''
%(str)s
-''',
- VERBATIM: r'''
+''',
+
+ VERBATIM: r'''
%(verb)s
''',
},
- LATEX : {
- AFTER: '',
- BEFORE: '',
- OUTPUT: r'''{\parindent 0pt
+ ##
+ LATEX: {
+ OUTPUT: r'''{%%
+\parindent 0pt
\catcode`\@=12
-\ifx\preLilyPondExample\undefined\relax\else\preLilyPondExample\fi
-\def\lilypondbook{}
-\input %(base)s.tex
-\ifx\postLilyPondExample\undefined\relax\else\postLilyPondExample\fi
-\catcode`\@=0}''',
- PRINTFILENAME: '''\\texttt{%(filename)s}
-
+\ifx\preLilyPondExample \undefined
+ \relax
+\else
+ \preLilyPondExample
+\fi
+\def\lilypondbook{}%%
+\input %(base)s-systems.tex
+\ifx\postLilyPondExample \undefined
+ \relax
+\else
+ \postLilyPondExample
+\fi
+}''',
+
+ PRINTFILENAME: '''\\texttt{%(filename)s}
''',
- QUOTE: r'''\begin{quotation}
+
+ QUOTE: r'''\begin{quotation}
%(str)s
\end{quotation}
-''',
- VERBATIM: r'''\noindent
+''',
+
+ 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''',
- AFTER: '',
- BEFORE: '',
- OUTPUT: r'''@noindent
-@image{%(base)s,,,[image of music],%(ext)s}
-''',
- PRINTFILENAME: '''@file{%(filename)s}
+ OUTPUT: r'''
+@iftex
+@include %(base)s-systems.texi
+@end iftex
+''',
+
+ OUTPUTIMAGE: r'''@noindent
+@ifinfo
+@image{%(base)s,,,%(alt)s,%(ext)s}
+@end ifinfo
+@html
+["\'])(.*)(?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)
+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
class Chunk:
def replacement_text (self):
return ''
-
+
def filter_text (self):
return self.replacement_text ()
+ def ly_is_outdated (self):
+ return 0
- def is_outdated (self):
+ def png_is_outdated (self):
return 0
class Substring (Chunk):
- def __init__ (self, source, start, 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 replacement_text (self):
- return self.source [self.start:self.end]
-
+ 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):
+ def __init__ (self, type, match, format, line_number):
self.type = type
self.match = match
self.hash = 0
- self.options = []
+ self.option_dict = {}
self.format = format
+ self.line_number = line_number
def replacement_text (self):
- return self.match.group (0)
-
+ return self.match.group ('match')
+
def substring (self, s):
return self.match.group (s)
def __repr__ (self):
- return `self.__class__` + " type = " + self.type
+ return `self.__class__` + ' type = ' + self.type
class Include_snippet (Snippet):
def processed_filename (self):
@@ -511,33 +748,205 @@ class Include_snippet (Snippet):
return os.path.splitext (f)[0] + format2ext[format]
def replacement_text (self):
- s = self.match.group (0)
+ s = self.match.group ('match')
f = self.substring ('filename')
-
+
return re.sub (f, self.processed_filename (), s)
class Lilypond_snippet (Snippet):
- def __init__ (self, type, match, format):
- Snippet.__init__ (self, type, match, format)
+ def __init__ (self, type, match, format, line_number):
+ Snippet.__init__ (self, type, match, format, line_number)
os = match.group ('options')
- if os:
- self.options = split_options (os)
+ self.do_options (os, self.type)
def ly (self):
return self.substring ('code')
-
+
def full_ly (self):
s = self.ly ()
if s:
- return compose_ly (s, self.options)
+ 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'
@@ -546,80 +955,115 @@ class Lilypond_snippet (Snippet):
outf = open (self.basename () + '.ly', 'w')
outf.write (self.full_ly ())
- def is_outdated (self):
+ 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 (tex_file)\
- and os.stat (tex_file)[stat.ST_SIZE] \
- and open (tex_file).readlines ()[-1][1:-1] \
- == 'lilypondend'
+ 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'))
+ ok = ok and os.path.exists (base + '.eps')
+
+ page_count = 0
+ if ok:
+ page_count = ly.ps_page_count (base + '.eps')
- if ok and (use_hash_p or self.ly () == open (ly_file).read ()):
- # TODO: something smart with target formats
- # (ps, png) and m/ctimes
- return None
- return self
+ 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')
+ code = self.substring ('code')
s = run_filter (code)
- d = {'code' : s,
- 'options': self.match.group ('options')
- }
+ 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]
+ func = Lilypond_snippet.__dict__['output_' + self.format]
return func (self)
-
+
def get_images (self):
base = self.basename ()
- # URGUGHUGHUGUGHU
+ # 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)\
+ 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 ())
+ count = ly.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 format == HTML:
str += self.output_print_filename (HTML)
- if VERBATIM in self.options:
+ if VERBATIM in self.option_dict:
verb = verbatim_html (self.substring ('code'))
str += write (output[HTML][VERBATIM] % vars ())
- if QUOTE in self.options:
+ 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)
+ (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 = self.output_print_filename (HTML)
- str = output[TEXINFO][BEFORE] % vars ()
+ str = ''
for image in self.get_images ():
- base, ext = os.path.splitext (image)
- # URG, makeinfo implicitely prepends dot to ext
- # specifying no extension is most robust
+ (base, ext) = os.path.splitext (image)
+
+ # URG, makeinfo implicitly prepends dot to extension.
+ # Specifying no extension is most robust.
ext = ''
- str += output[TEXINFO][OUTPUT] % vars ()
- str += output[TEXINFO][AFTER] % vars ()
+ alt = self.option_dict[ALT]
+ str += output[TEXINFO][OUTPUTIMAGE] % vars ()
+
+ base = self.basename ()
+ str += output[format][OUTPUT] % vars ()
return str
def output_latex (self):
@@ -627,47 +1071,52 @@ class Lilypond_snippet (Snippet):
base = self.basename ()
if format == LATEX:
str += self.output_print_filename (LATEX)
- if VERBATIM in self.options:
+ if VERBATIM in self.option_dict:
verb = self.substring ('code')
str += (output[LATEX][VERBATIM] % vars ())
- if QUOTE in self.options:
- str = output[LATEX][QUOTE] % vars ()
- str += (output[LATEX][BEFORE]
- + (output[LATEX][OUTPUT] % vars ())
- + output[LATEX][AFTER])
+ str += (output[LATEX][OUTPUT] % vars ())
+ if QUOTE in self.option_dict:
+ str = output[LATEX][QUOTE] % vars ()
return str
- def output_print_filename (self,format):
+ def output_print_filename (self, format):
str = ''
- if PRINTFILENAME in self.options:
+ 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 = ''
- # 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')
+ 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.options:
+ 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.options:
+ if VERBATIM in self.option_dict:
verb = verbatim_texinfo (self.substring ('code'))
- str += (output[TEXINFO][VERBATIM] % vars ())
+ str += (output[TEXINFO][VERBATIM] % vars ())
+ if not QUOTE in self.option_dict:
+ str = output[TEXINFO][NOQUOTE] % vars ()
- 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')
+ str += self.output_info ()
- if QUOTE in self.options:
+# 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
@@ -678,29 +1127,48 @@ class Lilypond_snippet (Snippet):
class Lilypond_file_snippet (Lilypond_snippet):
def ly (self):
name = self.substring ('filename')
- return '\\renameinput \"%s\"\n' % name\
- + open (find_file (name)).read ()
-
-
+ return '\\renameinput \"%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_toplevel_snippets (s, types):
- res = {}
- for i in types:
- res[i] = ly.re.compile (snippet_res[format][i])
+def find_linestarts (s):
+ 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
+
+ nls.append (len (s))
+ return nls
- snippets = []
- index = 0
- ## found = dict (map (lambda x: (x, None), types))
+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)
+ 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
@@ -708,56 +1176,67 @@ def find_toplevel_snippets (s, types):
# 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])
+ 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]
- snip = cl (type, m, format)
- start = index + m.start (0)
+
+
+ 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
+ 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 long as we do not
+ # 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)))
+ endex = found[first][0]
+
+ if not first:
+ snippets.append (Substring (s, index, len (s), line_start_idx))
break
- (start , snip) = found[first]
- snippets.append (Substring (s, index, start))
+ 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 (0))
+ index = start + len (snip.match.group ('match'))
- return snippets
+ return snippets
def filter_pipe (input, cmd):
if verbose_p:
- ly.progress (_ ("Opening filter `%s\'") % cmd)
-
- stdin, stdout, stderr = os.popen3 (cmd)
+ ly.progress (_ ("Opening filter `%s'") % cmd)
+
+ (stdin, stdout, stderr) = os.popen3 (cmd)
stdin.write (input)
status = stdin.close ()
@@ -766,27 +1245,27 @@ def filter_pipe (input, cmd):
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 (_ ("`%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
-
+
def run_filter (s):
return filter_pipe (s, filter_cmd)
-def is_derived_class (cl, baseclass):
+def is_derived_class (cl, baseclass):
if cl == baseclass:
return 1
for b in cl.__bases__:
@@ -794,22 +1273,37 @@ def is_derived_class (cl, baseclass):
return 1
return 0
-
-def process_snippets (cmd, snippets):
- names = filter (lambda x: x, map (Lilypond_snippet.basename, snippets))
- if names:
- ly.system (string.join ([cmd] + names))
-
- if format == HTML or format == TEXINFO:
- for i in names:
- if not os.path.exists (i + '.eps') and os.path.exists (i + '.tex'):
- to_eps (i)
- ly.make_ps_images (i + '.eps', resolution=110)
-# elif os.path.exists (i + '.ps'):
-# ly.make_ps_images (i + '.ps', resolution=110)
-
-
-LATEX_DOCUMENT = r'''
+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_INSPECTION_DOCUMENT = r'''
+\nonstopmode
%(preamble)s
\begin{document}
\typeout{textwidth=\the\textwidth}
@@ -817,12 +1311,21 @@ LATEX_DOCUMENT = r'''
\makeatletter\if@twocolumn\typeout{columns=2}\fi\makeatother
\end{document}
'''
-#need anything else besides textwidth?
+
+# Do we need anything else besides `textwidth'?
def get_latex_textwidth (source):
m = re.search (r'''(?P