lilypond-1.3.140

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 291ea571b58f82d9821d86aa43351896ceab6694..c3389062a320e293d168f279846879efe2ee2d0e 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -4,7 +4,7 @@
 @chapter Tutorial
 
 @menu
-* Introduction::                Introduction
+* Introduction::                
 * Running LilyPond::            Getting started
 * The first tune::              The first tune
 * Lyrics and chords::           Lyrics and chords
@@ -1428,16 +1428,13 @@ line is not indented.  The line still looks very cramped, but that is due
 to the page layout of this document.
 
 
+@ignore
 [TODO:
 
-* arpeggio, glissando, 
-
-* \apply, \outputproperty, \translator @{@}, \molecule hacking.
-
-* font-size, cadenza. rhythmic staff, multi-stanza.
+* font-size, multi-stanza.
 
 * Simple part combining in a Hymn
-
+@end ignore
 
 @node An orchestral score
 @section An orchestral score
@@ -1482,6 +1479,7 @@ tromboII = \notes\relative c'' @{
 timpani = \notes\relative c, @{
   \times 2/3 @{ f4 f f @}
   \times 4/5 @{ as8 as as as as @}
+  R1
 @}
 corno = \notes\relative c' @{
    bes4 d f, bes d f, bes d
@@ -1560,10 +1558,14 @@ conductor's score.
     @}
     \translator@{
       \VoiceContext
-      \remove "Rest_engraver";    
+      \remove "Rest_engraver";
+      \consists "Multi_measure_rest_engraver";
+      \consists "Bar_engraver";
     @}
     \translator@{
       \HaraKiriStaffContext
+      \remove "Multi_measure_rest_engraver";
+      \remove "Bar_engraver";
     @}
     \translator @{
       \OrchestralScoreContext
@@ -1702,8 +1704,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
@@ -1712,6 +1715,8 @@ need the @code{Rest_engraver} from Voice to Thread level.
     \translator@{
       \VoiceContext
       \remove "Rest_engraver";    
+      \consists "Multi_measure_rest_engraver";
+      \consists "Bar_engraver";
     @}
 @end example
 
@@ -1722,6 +1727,8 @@ the automatic removing of empty staffs.
 @example
     \translator@{
       \HaraKiriStaffContext
+      \remove "Multi_measure_rest_engraver";
+      \remove "Bar_engraver";
     @}
 @end example
 
@@ -1813,3 +1820,8 @@ bars.
          
 That's all folks.  From here, you can either try fiddling with input
 files, or you can read the reference manual.
+
+
+@c @lilypond[nofragment]
+@c #(set! point-and-click #f)
+@c @end lilypond 

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'