(global_latex_preamble): only set

twosideshift if 'twoside' is in latexoptions

diff --git a/ChangeLog b/ChangeLog
index 6768cec2fcc43d54880d49946b1cd75be7d73c3a..91a234dcdeed373aaeb8bd3314e8ae08db242054 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scripts/lilypond.py (global_latex_preamble): only set
+       twosideshift if 'twoside' is in latexoptions 
+
        * stepmake/GNUmakefile.in: remove nested stepmake packaging stuff.
 
        * VERSION: remove

diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly
index 9312f07279538bb3e47acb902043fe9ae3f0d129..354de4dce4a31d5199362e9b48b7325eac7ee9f3 100644 (file)
--- a/input/regression/chord-names-bass.ly
+++ b/input/regression/chord-names-bass.ly
@@ -1,3 +1,5 @@
+\version "1.9.5"
+
 \header {
 
 texidoc = "Test igatzek inversion and bass notes.
@@ -13,6 +15,6 @@ bladidbla = \chords {
  }
 
 \score {
-< \context ChordNames \bladidbla
-  \context Voice \bladidbla >
+<< \context ChordNames \bladidbla
+  \context Voice \bladidbla >>
 }

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 36b56aab16f923b44395f2a4ff3f0a2e3ac7c1b2..1a2cebdfe3825b4fcc9bf1207749ad0752793014 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -362,7 +362,7 @@ wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3)
 LY_DEFINE(ly_version,  "ly:version", 0, 0, 0, (),
          "Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ")
 {
-  char const* vs =  "\' (" MAJOR_VERSION " " MINOR_VERSION " "  PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
+  char const* vs =  "\'(" MAJOR_VERSION " " MINOR_VERSION " "  PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
   
   return gh_eval_str ((char*)vs);
 }

diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index 04d278a65e363b015ed3ff75d9beceb4a746bcd1..a16dc0cf8a017bca88a7d37815029459054a170c 100644 (file)
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -432,7 +432,9 @@ def global_latex_preamble (extra):
                linewidth = '%d%s' % (maxlw, unit)
        s = s + '\geometry{width=%s%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
 
-       if extra['latexoptions']:
+
+       if extra['latexoptions'] \
+              and string.find (extra['latexoptions'], 'twoside') >= 0:
                s = s + '\geometry{twosideshift=4mm}\n'
 
        s = s + r'''

diff --git a/stepmake/bin/make-version.py b/stepmake/bin/make-version.py
index 1319b2875b75ceff107bff4be91455832407885f..7888a7d0c1877f51c111d0e0305514efc2f65a9f 100644 (file)
--- a/stepmake/bin/make-version.py
+++ b/stepmake/bin/make-version.py
@@ -4,16 +4,10 @@ import sys
 import getopt
 
 
-vf = 'VERSION'
-if sys.argv[1:]:
-       vf = sys.argv[1]
-
-f = open (vf)
-ls = f.readlines ()
 mypatch = 0
 defs = []
-for a in sys.argv[1:]
-       m  = re.search ('([^ =]*)=([^ \t]*)[ \t]*\n', a)
+for a in sys.argv[1:]:
+       m  = re.search ('([^ =]+)=([^ \t]*)', a)
        if m:
                defs.append ((m.group(1), m.group(2)))
 
@@ -34,7 +28,6 @@ for d in defs:
        
        sys.stdout.write ('#define %s "%s"\n' % d)
        
-
 if ('MY_PATCH_LEVEL', '') in defs:
        sys.stdout.write ('#define NO_MY_PATCHLEVEL')
 

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 0d3eb08a0c1eca3b472c16df671e206f3ff290d0..806a125b2a7e46b3bb4fa46bee8b151ef58d714b 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -99,8 +99,8 @@ $(outdir)/version.hh: $(config_make)
        $(PYTHON) $(step-bindir)/make-version.py PACKAGE_NAME=$(PACKAGE_NAME) \
                MAJOR_VERSION=$(MAJOR_VERSION) \
                MINOR_VERSION=$(MINOR_VERSION) \
-               MY_PATCH_LEVEL=$(MY_PATCH_LEVEL) \
                PATCH_LEVEL=$(PATCH_LEVEL) \
+               MY_PATCH_LEVEL=$(MY_PATCH_LEVEL) \
                > $@
 
 $(outdir)/config.h: $(config_h)