patch::: 1.3.91.tca2

diff --git a/VERSION b/VERSION
index b592e136563c4927245519d7adff5954471cebdc..f34eb289b7972b541becdbc28859158f411959cc 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=91
-MY_PATCH_LEVEL=tca1
+MY_PATCH_LEVEL=tca2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py
index d04d8e1e57280c0bfb4f07091c0b3b26623a9bbf..8a334b40b68ff142b668fe101fd8e10404020a14 100644 (file)
--- a/scripts/mudela-book.py
+++ b/scripts/mudela-book.py
@@ -199,7 +199,6 @@ class LatexPaper:
                #return self.m_paperdef[self.m_papersize][self.m_landscape]
        
        def _calc_linewidth(self):
-       Fortsettt
                # since geometry sometimes ignores 'includemp', this is
                # more complicated than it should be
                mp = 0
@@ -742,10 +741,12 @@ def read_doc_file (filename):
                        error("error: can't determine format, please specify")
                if texinfo:
                        __main__.format = 'texi'
-                       __main__.paperguru = TexiPaper()
                else:
                        __main__.format = 'latex'
-                       __main__.paperguru = LatexPaper()
+       if __main__.format == 'texi':
+               __main__.paperguru = TexiPaper()
+       else:
+               __main__.paperguru = LatexPaper()
        chunks = [('input', str)]
        # we have to check for verbatim before doing include,
        # because we don't want to include files that are mentioned