From fc8ae92974b97aaed17685eec92a6b179ea39bb2 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 22:43:34 +0000
Subject: [PATCH] lilypond-1.3.7
---
Documentation/user/lilypond.tely | 2 +-
Documentation/user/mudela-book.tely | 72 ++++++++++++++++++++++++++++-
scripts/ly2dvi.py | 2 +-
scripts/mudela-book.py | 6 ++-
4 files changed, 77 insertions(+), 5 deletions(-)
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 1567ec748e..24e06721ab 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -5,7 +5,7 @@
@titlepage
-@title LilyPond
+@title LilyPond Reference Manual
@subtitle The GNU Project Typesetter
@author Han-Wen Nienhuys, Jan Nieuwenhuizen and Adrian Mariano
diff --git a/Documentation/user/mudela-book.tely b/Documentation/user/mudela-book.tely
index 10f115a116..37299dc14e 100644
--- a/Documentation/user/mudela-book.tely
+++ b/Documentation/user/mudela-book.tely
@@ -1,6 +1,74 @@
\input texinfo @c -*-texinfo-*-
-@setfilename reference-manual.info
-@settitle Reference Manual
+@setfilename mudela-book.info
+@settitle mudela-book Manual
+
+
+@titlepage
+@title mudela-book Manual
+@subtitle Integrating mudela with LateX and TeXinfo
+@author Tom Cato Amundsen and Han-Wen Nienhuys
+
+ Copyright @copyright 1999 by the authors
+
+@vskip 0pt plus 1filll
+
+Permission is granted to make and distribute verbatim
+copies of this manual provided the copyright notice and
+this permission notice are preserved on all copies.
+
+Permission is granted to copy and distribute modified
+versions of this manual under the conditions for
+verbatim copying, provided also that the sections
+entitled ``Copying'' and ``GNU General Public License''
+are included exactly as in the original, and provided
+that the entire resulting derived work is distributed
+under the terms of a permission notice identical to this
+one.
+
+Permission is granted to copy and distribute
+translations of this manual into another language,
+under the above conditions for modified versions,
+except that this permission notice may be stated in a
+translation approved by the Free Software Foundation.
+
+@end titlepage
+
+@ifinfo
+This file documents GNU LilyPond.
+
+Copyright 1999 Tom Cato Amundsen and Han-Wen Nienhuys
+
+
+Permission is granted to make and distribute verbatim
+copies of this manual provided the copyright notice and
+this permission notice are preserved on all copies.
+
+@ignore
+Permission is granted to process this file through TeX
+and print the results, provided the printed document
+carries a copying permission notice identical to this
+one except for the removal of this paragraph (this
+paragraph not being relevant to the printed manual).
+
+@end ignore
+
+Permission is granted to copy and distribute modified
+versions of this manual under the conditions for
+verbatim copying, provided also that the sections
+entitled ``Copying'' and ``GNU General Public License''
+are included exactly as in the original, and provided
+that the entire resulting derived work is distributed
+under the terms of a permission notice identical to this
+one.
+
+Permission is granted to copy and distribute
+translations of this manual into another language,
+under the above conditions for modified versions,
+except that this permission notice may be stated in a
+translation approved by the Free Software Foundation.
+
+@end ifinfo
+
@node Top, , , (dir)
@top
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 57702825d5..b309317ff1 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -925,7 +925,7 @@ def writeLilylog(file,contents):
def getTeXFile(contents):
texfiles=[]
for line in string.split(contents,'\n'):
- m = re.search('^paper output to (.+)\.\.\.', line)
+ m = re.search('paper output to (.+)\.\.\.', line)
if m:
texfiles.append(m.group(1))
diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py
index 59bde3bbd7..e4114a7de8 100644
--- a/scripts/mudela-book.py
+++ b/scripts/mudela-book.py
@@ -52,6 +52,7 @@ options = [
('', '', 'force-verbatim', 'make all mudela verbatim'),
('', 'M', 'dependencies', 'write dependencies'),
('', 'n', 'no-lily', 'don\'t run lilypond'),
+ ('', '', 'no-pictures', "don\'t generate pictures"),
('FILE', 'o', 'outname', 'prefix for filenames'),
('', 'v', 'version', 'print version information' ),
('PREF', '', 'dep-prefix', 'prepend PREF before each -M dependency')
@@ -61,6 +62,7 @@ format = ''
run_lilypond = 1
use_hash = 1
no_match = 'a\ba'
+do_pictures = 1
# format specific strings, ie. regex-es for input, and % strings for output
output_dict= {
@@ -669,7 +671,7 @@ def compile_all_files (chunks):
eps.append (base)
elif e == 'tex':
tex.append (base + '.ly')
- elif e == 'png':
+ elif e == 'png' and do_pictures:
png.append (base)
if __main__.use_hash:
@@ -863,6 +865,8 @@ for opt in options:
initfile = a
elif o == '--dep-prefix':
dep_prefix = a
+ elif o == '--no-pictures':
+ do_pictures = 0
identify()
--
2.39.5