patch::: 1.3.139.jcn3

1.3.139.jcn3
============

* Bugfix: ly2dvi: added letter support, catch indexing with unknown
papersize names.

* ly2dvi: removed warning message and changed --set=papersizename= to
--set=papersize=.  This fixes mutopia letter-targets.

---
Generated by janneke@gnu.org,
From = lilypond-1.3.139.jcn2, To = lilypond-1.3.139.jcn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.139.jcn3.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index 512f4b9e861dde76adf9f43d8cdec9466952817b..7ea1bbb91cdb666837b9e84a6fd9907563144dd0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,18 @@
---- ../lilypond-1.3.139.jcn1/CHANGES   Sun Mar 18 14:46:40 2001
+--- ../lilypond-1.3.139.jcn2/CHANGES   Sun Mar 18 17:33:23 2001
+++ b/CHANGES   Sun Mar 18 19:41:31 2001
+@@ -1,3 +1,12 @@
+1.3.139.jcn3
+============
+
+* Bugfix: ly2dvi: added letter support, catch indexing with unknown
+papersize names.
+
+* ly2dvi: removed warning message and changed --set=papersizename= to
+--set=papersize=.  This fixes mutopia letter-targets.
+
+ 1.3.139.jcn2
+ ============
+ --- ../lilypond-1.3.139.jcn1/CHANGES  Sun Mar 18 14:46:40 2001
 ++ b/CHANGES   Sun Mar 18 17:33:23 2001
 @@ -1,3 +1,13 @@
 1.3.139.jcn2

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index c6e2983efef7473a4af56d084b01fca34b440d2e..040d3798c0089dcd9d0306964bf99325988aca7c 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1707,8 +1707,9 @@ tuturial.
     linewidth = 60 * \staffspace;
 @end example
 
-Because we have a Thread representing one instument, we move the
-need the @code{Rest_engraver} from Voice to Thread level.
+Because we have a Thread representing one instrument, we need to move
+the @code{Rest_engraver} from Voice to Thread level.  Similarly, we need
+to move the @code{Multi_measure_rest_engraver} from Staff to Voice level.
 @example
     \translator@{
       \ThreadContext

diff --git a/VERSION b/VERSION
index 46478ce7a55c494baba68dff6979674295b058c3..aacd4bc396a7527afa683137bd6c54705b869fa0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=139
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index ce54cc16fd870bb3cb2e63c1098af2a0924cad99..39bf14ef69fe45dd2320b162df1262a7fbb6cfb6 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -2,11 +2,11 @@
 
 % Ugh, we need to override some LaTeX titling stuff
 \header {
-  title =      "Ouverture\\vrule width0pt height 0pt depth 1ex";
+  title =      "Ouvertüre\\vrule width0pt height 0pt depth 1ex";
   subtitle =   "\\normalsize Zu Heinrich Joseph v. Collins Trauerspiel\\vrule width0pt height 0pt depth 1ex";
   subsubtitle =        "\\Large\\bf Coriolan";
   opus =  "Op. 62";
-  piece = "\\normalfont\\large Allegro con brio";
+  piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio";
   composer =    "Ludwig van Beethoven (1770-1827)";
   enteredby =   "JCN";
 }
@@ -30,8 +30,8 @@ oboi = \notes \relative c' {
 }
 
 clarinetti = \notes \relative c' {
-   \property Staff.instrument = #`("Clarinetti in B" ,text-flat)
-%  \property Staff.instrument  = #`(lines "2 Clarinetti" (rows "(B" ,raisedflat ")"))
+%   \property Staff.instrument = #`("Clarinetti in B" ,text-flat)
+  \property Staff.instrument   = #`(lines "2 Clarinetti" (rows "(B" ,raisedflat ")"))
   \property Staff.instr                = #`(lines "Cl." (rows "(B" ,raisedflat ")"))
 
   c1 c

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index d88938feb791dc142fe41dc4dc6903cba7382b92..461258cb973ee569fcf99c31e7ff3893164a65f9 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -42,7 +42,7 @@ extra_init = {
        'language' : [],
        'latexheaders' : [],
        'latexpackages' :  ['geometry'],
-       'papersizename' : [],
+       'papersize' : [],
        'pagenumber' : [],
        'textheight' : [], 
        'linewidth' : [],
@@ -275,7 +275,7 @@ def set_setting (dict, key, val):
        try:
                val = string.atof (val)
        except ValueError:
-               warning (_ ("invalid value: %s") % `val`)
+               #warning (_ ("invalid value: %s") % `val`)
                pass
 
        try:
@@ -294,7 +294,7 @@ def analyse_lilypond_output (filename, extra):
 
        # search only the first 10k
        s = s[:10240]
-       for x in ('textheight', 'linewidth', 'papersizename', 'orientation'):
+       for x in ('textheight', 'linewidth', 'papersize', 'orientation'):
                m = re.search (r'\\def\\lilypondpaper%s{([^}]*)}'%x, s)
                if m:
                        set_setting (extra, x, m.group (1))
@@ -357,7 +357,7 @@ def one_latex_definition (defn, first):
 
 ly_paper_to_latexpaper =  {
        'a4' : 'a4paper',
-       
+       'letter' : 'letterpaper', 
 }
 
 def global_latex_definition (tfiles, extra):
@@ -371,8 +371,13 @@ def global_latex_definition (tfiles, extra):
 
        paper = ''
 
-       if extra['papersizename']:
-               paper = '[%s]' % ly_paper_to_latexpaper[extra['papersizename'][0]]
+       if extra['papersize']:
+               try:
+                       paper = '[%s]' % ly_paper_to_latexpaper[extra['papersize'][0]]
+               except:
+                       warning (_ ("invalid value: %s") % `extra['papersize'][0]`)
+                       pass
+       
        s = s + '\\documentclass%s{article}\n' % paper
 
        if extra['language']:
@@ -445,8 +450,8 @@ def generate_postscript (dvi_name, extra):
        '''Run dvips on DVI_NAME, optionally doing -t landscape'''
 
        opts = ''
-       if extra['papersizename']:
-               opts = opts + ' -t %s' % extra['papersizename'][0]
+       if extra['papersize']:
+               opts = opts + ' -t %s' % extra['papersize'][0]
 
        if extra['orientation'] and extra['orientation'][0] == 'landscape':
                opts = opts + ' -t landscape'