patch::: 1.3.117.mb1

1.3.117.mb1
===========

* Bugfix: fetdefs.tex: don't redefine the standard TeX macros
  \sharp,\natural or \flat.

* Bugfix: ly2dvi: handle the --landscape option. Leave the textheight
  calculation to the geometry package. Remove some dead code.

* Bugfix: correct font-family for TextSpanner.

* Bugfix: script-engraver.cc: forced script directions work again.

---
Generated by (address unknown),
From = lilypond-1.3.117, To = lilypond-1.3.117.mb1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.117.mb1.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 59fd9cf7312d943a22215c4e4e57dc0c55c223ca..4259d2bee65fa854f7e8fba93483f734d3933032 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,22 @@
-1.3.117.jcn1
+--- ../lilypond-1.3.117/CHANGES        Thu Dec 14 18:44:08 2000
+++ b/CHANGES   Sat Dec 16 21:58:37 2000
+@@ -1,3 +1,16 @@
+1.3.117.mb1
+===========
+
+* Bugfix: fetdefs.tex: don't redefine the standard TeX macros 
+  \sharp,\natural or \flat.
+
+* Bugfix: ly2dvi: handle the --landscape option. Leave the textheight
+  calculation to the geometry package. Remove some dead code.
+
+* Bugfix: correct font-family for TextSpanner.
+
+* Bugfix: script-engraver.cc: forced script directions work again.
+
+ 1.3.116.jcn4
+ ============
+ 1.3.117.jcn1
 ============
 
 * Resurrected direct postscript output, ie. lilypond --output-format=ps.

diff --git a/Documentation/user/ly2dvi.texi b/Documentation/user/ly2dvi.texi
index 94ac18a465c1b19260e8c5b5fbf98384871a56b7..959802de658815ffa658f4f313bc220e8cf647d4 100644 (file)
--- a/Documentation/user/ly2dvi.texi
+++ b/Documentation/user/ly2dvi.texi
@@ -39,7 +39,8 @@ Arne Fagertun name @file{ly2dvi}.
     Keep LilyPond output after the run.
 @item -L,--landscape
     Set landscape orientation - portrait is the default.
-    (@strong{-L} produces @code{\usepackage[landscape]@{article@}})
+    Use together with @code{dvips -t landscape} if you run dvips 
+    separately. 
 @item -N,--nonumber
     Switch off page numbering.
 @item -O,--orientation=

diff --git a/VERSION b/VERSION
index c343984e8e736076123a76a9b03c0d6e19305b25..110c6def114aa36ab9b847bb57f565ea8129fe96 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=117
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index af30403cf1d190e73637681b73a3775db350ad82..5f1467ab0b6fbd755395bfa570f9a8564b9520bd 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -81,7 +81,7 @@ Script_engraver::create_grobs ()
       art = gh_cdr(art);
 
       SCM force_dir = l->get_mus_property ("direction");
-      if (isdir_b (force_dir) && to_dir (force_dir))
+      if (isdir_b (force_dir) && !to_dir (force_dir))
        force_dir = gh_car (art);
       
       art = gh_cdr(art);

diff --git a/ly/paper.ly b/ly/paper.ly
index 145d1e050502aa91386835dbc93970ffabf54895..0a475b7350a07f96e740293680984e4d4319e76e 100644 (file)
--- a/ly/paper.ly
+++ b/ly/paper.ly
@@ -7,7 +7,8 @@
 %textheight = \staffheight/20.0 * \textheight20;
 
 linewidth = \hsize - 2.\cm;
-textheight = \vsize - 4.\cm;
+% Leave the textheight calculation to the geometry package. /MB
+%textheight = \vsize - 4.\cm;
 
 indent = \linewidth / 14.0;
 

diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm
index b5958a2fada06c2ae54ef6ec8015bb905099ab22..aef30fe46f99ac0f4d65a897e205fe3f8e3d90e7 100644 (file)
--- a/scm/element-descriptions.scm
+++ b/scm/element-descriptions.scm
@@ -555,6 +555,7 @@
        (TextSpanner . (
                (molecule-callback . ,Text_spanner::brew_molecule)
                 (font-shape . italic)
+               (font-family . roman)
                (type . "line")
                
                ;; urg, only for (de)cresc. text spanners

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 635932dc28bb3a0d50ff7c33ca116034fdd93ce9..7b2f25c7f435cc2ae6379107756a465286766298 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -224,11 +224,11 @@ class TeXOutput:
     #
     def start(this,file):
         """
-        Start LaTeX file.  Calculates the horizontal and vertical
-        margin using pagewidth, pageheight, linewidth, and textheight.
-        Creates temporary output filename and opens it for write.
-        Sends the LaTeX header information to output.  Lastly sends
-        the title information to output.
+        Start LaTeX file. Sets the linewidth (and possibly the
+        textheight) and leaves the page layout to the geometry
+        package. Creates temporary output filename and opens it
+        for write. Sends the LaTeX header information to output.
+        Lastly sends the title information to output.
 
         input:  file  output file name 
         output: None
@@ -236,16 +236,14 @@ class TeXOutput:
         """
 
         now=time.asctime(time.localtime(time.time()))
-        linewidth = Props.get('linewidth')
-        textheight = Props.get('textheight')
 
-        if Props.get('orientation') == 'landscape':
-            pagewidth = Props.get('pageheight')
-            pageheight = Props.get('pagewidth')
+        # Only set the textheight if it was explicitly set by the user,
+        # otherwise use the default. Helps to handle landscape correctly!
+        if Props.get('textheight') > 0:
+            textheightsetting = ',textheight=' + `Props.get('textheight')` + 'pt'
         else:
-            pageheight = Props.get('pageheight')
-            pagewidth = Props.get('pagewidth')
-                                
+            textheightsetting = ''
+
 
         top= r"""
 %% Creator: %s
@@ -264,7 +262,7 @@ class TeXOutput:
 %%\headheight9pt
 %%\headsep0pt
 %% Maybe this is too drastic, but let us give it a try.
-\geometry{width=%spt, textheight=%spt,headheight=2mm,headsep=0pt,footskip=2mm} 
+\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s} 
 \input{titledefs}
 %s
 \makeatletter
@@ -275,8 +273,8 @@ class TeXOutput:
 \renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%%
 \begin{document}
 """ % ( program_id(), Props.get('filename'), now, Props.get('papersize'),
-        Props.get('language'), Props.get('pagenumber'), linewidth,
-        textheight, Props.get('header') )
+        Props.get('language'), Props.get('pagenumber'), Props.get('linewidth'),
+        textheightsetting, Props.get('orientation'), Props.get('header') )
         
         base, ext = os.path.splitext(file)
         this.__base = base
@@ -363,10 +361,13 @@ class TeXOutput:
                         % (outfile))
 
         if Props.get('postscript'):
+            dvipsopts=''
+            if Props.get('orientation') == 'landscape':
+                dvipsopts=dvipsopts + ' -t landscape'
             psoutfile=this.__base + '.ps'
             if Props.get('output') != '':
                 psoutfile = os.path.join(Props.get('output'), psoutfile )
-            stat = os.system('dvips -o %s %s' % (psoutfile,outfile))
+            stat = os.system('dvips %s -o %s %s' % (dvipsopts,psoutfile,outfile))
             if stat:
                 sys.exit('ExitBadPostscript')
             
@@ -418,8 +419,6 @@ class Properties:
             this.__roverrideTable[i[1]]=i[0]
         
         this.__data = {
-            'pagewidth'    :  [597, this.__overrideTable['init']],
-            'pageheight'   :  [845, this.__overrideTable['init']],
             'papersize'    :  ['a4paper', this.__overrideTable['init']],
             'textheight'   :  [0, this.__overrideTable['init']],
             'linewidth'    :  [500, this.__overrideTable['init']],
@@ -649,8 +648,6 @@ class Properties:
         for paper in paperTable:
             if re.match(paper[0],size):
                 found=1
-                this.__set('pagewidth',paper[1],requester)
-                this.__set('pageheight',paper[2],requester)
                 this.__set('papersize',paper[3],requester)
                 break
 

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 54afa936fba3343cab5ccf907bed552c343e3da6..d98c6327af66c5f32205688c30a111d3e2d8ea4b 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -5,13 +5,13 @@
 \def\fetdef#1#2{%
   \def#1{\hbox{\char#2}}}
 
-\fetdef\sharp{16}
-\fetdef\natural{17}
-\fetdef\flat{18}
+\fetdef\fetasharp{16}
+\fetdef\fetanatural{17}
+\fetdef\fetaflat{18}
 \font\fetasixteenfont=feta16
 \def\fetafont{\fetasixteenfont}
-\def\textflat{{\fetafont\raise 1ex\hbox{\flat}}}
-\def\textnatural{{\fetafont\raise 1ex\hbox{\natural}}}
-\def\textsharp{{\fetafont\raise1ex\hbox{\sharp}}}
+\def\textflat{{\fetafont\raise 1ex\hbox{\fetaflat}}}
+\def\textnatural{{\fetafont\raise 1ex\hbox{\fetanatural}}}
+\def\textsharp{{\fetafont\raise1ex\hbox{\fetasharp}}}
 
 \endinput