* stepmake/stepmake/texinfo-rules.make:

* Documentation/GNUmakefile: --srcdir build fixes.

* input/test/coriolan-margin.ly: Put papersize settings in \bookpaper.

diff --git a/ChangeLog b/ChangeLog
index 0f1e6acbc21c5064726f7cb19d85bd9025fe50af..9243bbfd81276586671bc353c7fa9aff4999df19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-09-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * stepmake/stepmake/texinfo-rules.make: 
+       * Documentation/GNUmakefile: --srcdir build fixes.
+
+       * input/test/coriolan-margin.ly: Put papersize settings in \bookpaper.
+
        * Documentation/user/latex-lilypond-example.latex:
        * Documentation/user/latex-example.latex: Fix compile errors.
        Still buggy, need more love.

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 6fbd2932f53588711a1a9422adafb31c8f57ba05..4954461582c82620dd6fa541c4012c4df5757a1d 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -93,8 +93,8 @@ $(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
 
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi 
        mkdir -p $(dir $@)
-       $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(builddir)/Documentation/texinfo.css --html $<
-       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(builddir)/Documentation/texinfo.css --html --no-split --no-headers $<
+       $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
+       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
        perl -i~ -pe 's!../lilypond-internals!lilypond-internals/!g' $(outdir)/lilypond.html
        rm -f $(outdir)/lilypond/*.png $(outdir)/lilypond/*.ly
 # symbolic links to save space 
@@ -102,8 +102,8 @@ $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
        mkdir -p $(dir $@)
-       $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(builddir)/Documentation/texinfo.css --html $<
-       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(builddir)/Documentation/texinfo.css --html --no-split --no-headers $<
+       $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
+       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
 ifeq ($(SPLITTING_MAKEINFO),yes)
 

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 238abdc67c92c2402e43401aa1d95ef2e1c7bc5a..341a9c77a090aefb2c58d88b12fd39a4b07fb7bc 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -14,14 +14,17 @@ set -ex
 # Where user built stuff will be installed
 OPT=$HOME/usr/pkg
 ## when using GUILE CVS, make a slib/require like so:
-## cd ~/usr/pkg/guile/share/guile/1.7 && ln -s /usr/share/guile/1.6/slib .
-## cd && guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-## otherwise, this may fix it...
+cat > /dev/null <<EOF
+cd ~/usr/pkg/guile/share/guile/1.7 && ln -s /usr/share/guile/1.6/slib .
+cd && guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+EOF
+# otherwise, this may fix it...
 SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
 GGVERSION=2.5.995
+GWRAPVERSION=1.9.3rc1
 
 export AUTOMAKE=automake-1.8
 export ACLOCAL=aclocal-1.8
@@ -42,7 +45,7 @@ fi
 
 # test: the name of our download and build directory
 rm -rf test
-mkdir test
+mkdir -p test
 cd test
 
 ## 1.  install gnome-devel
@@ -77,7 +80,7 @@ if ! pkg-config --atleast-version=1.5.1 pango; then
 fi
 
 ## 3. Currently (2004-9-15) GUILE CVS works somewhat
-##    There's a guile/g-wrap problem with integer parameters
+##    But there's a guile/g-wrap problem with integer parameters
 unset GUILE_LOAD_PATH
 PATH=/usr/bin:$PATH
 
@@ -104,9 +107,10 @@ if ! pkg-config --exact-version=1.9.1 g-wrap-2.0-guile; then
         ## ughr:
        mkdir -p g-wrap/libffi
     else
-       wget -N http://savannah.nongnu.org/download/g-wrap/g-wrap-1.9.1.tar.gz
-       tar zxf g-wrap-1.9.1.tar.gz
-       ln -s g-wrap-1.9.1 g-wrap
+       #wget -N http://savannah.nongnu.org/download/g-wrap/g-wrap-$GWRAPVERSION.tar.gz
+       wget -N http://stud3.tuwien.ac.at/~e9926584/tmp/g-wrap-$GWRAPVERSION.tar.gz
+       tar xzf g-wrap-$GWRAPVERSION.tar.gz
+       ln -s g-wrap-$GWRAPVERSION g-wrap
     fi
     cd g-wrap
     

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index f73fcc52bf54a81430709075598b0f139a78e729..c7502a5aabe0f43a534e3c98685fe902d4717387 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -101,47 +101,56 @@ violoncello =  \relative c' {
 }
 
 
+% ugf, must be here?
+\bookpaper {
+    indent=10.0\mm
+    linewidth=150.0\mm
+}
+
 #(set-global-staff-size 16)
-\score {
-  << 
-    \context StaffGroup ="legni" << 
-      \context Staff ="flauti" \flauti
-      \context Staff ="oboi" \oboi
-      \context Staff ="clarinetti" \clarinetti 
-      \context Staff ="fagotti" \fagotti 
-    >>
-    \context StaffGroup ="ottoni" <<
-      \context Staff ="corni" \corni
-      \context Staff ="trombe" \trombe
-    >>
-    \context StaffGroup ="timpani" <<
-      \context Staff ="timpani" \timpani
-     { 
-       \skip 1 
-       % Hmm: this forces a staff-bracket, that's good!
-       % However, I can't find where is decided on staff-bracket yes/no
-     }
-    >>
-    \context StaffGroup ="archi" <<
-      \context GrandStaff ="violini" <<
-        \context Staff ="violinoI" \violinoI
-        \context Staff ="violinoII" \violinoII
+\book {
+    \score {
+      << 
+       \context StaffGroup ="legni" << 
+         \context Staff ="flauti" \flauti
+         \context Staff ="oboi" \oboi
+         \context Staff ="clarinetti" \clarinetti 
+         \context Staff ="fagotti" \fagotti 
+       >>
+       \context StaffGroup ="ottoni" <<
+         \context Staff ="corni" \corni
+         \context Staff ="trombe" \trombe
+       >>
+       \context StaffGroup ="timpani" <<
+         \context Staff ="timpani" \timpani
+        { 
+          \skip 1 
+          % Hmm: this forces a staff-bracket, that's good!
+          % However, I can't find where is decided on staff-bracket yes/no
+        }
+       >>
+       \context StaffGroup ="archi" <<
+         \context GrandStaff ="violini" <<
+           \context Staff ="violinoI" \violinoI
+           \context Staff ="violinoII" \violinoII
+         >>
+         \context Staff ="viola" \viola
+         \context Staff ="violoncello" \violoncello
+       >>
       >>
-      \context Staff ="viola" \viola
-      \context Staff ="violoncello" \violoncello
-    >>
-  >>
-  \paper {
-      indent=100.0\mm
-      linewidth=150.0\mm
-      \context {
-         \RemoveEmptyStaffContext
-      }
-      \context {
-         \Score
-         \override TimeSignature #'style = #'C
+      \paper {
+         \context {
+             \RemoveEmptyStaffContext
+         }
+         \context {
+             \Score
+             \override TimeSignature #'style = #'C
+         }
       }
-  }
+    }
+    % this is ignored?
+    \bookpaper {
+       indent=10.0\mm
+       linewidth=150.0\mm
+    }
 }
-
-

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 853ecaa6c144528f1f64368dec9ca181c8ede9bf..c43ec1aef075ffabbe020a3d0ffca3f5e77841a1 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -5,7 +5,7 @@ $(outdir)/%.info: $(outdir)/%.texi
        $(MAKEINFO) -I $(outdir) --output=$@ $<
 
 $(outdir)/%.html: $(outdir)/%.texi
-       $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(builddir)/Documentation/texinfo.css --html --no-split --no-headers $<
+       $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
 $(outdir)/%.html.omf: %.texi
        $(call GENERATE_OMF,html)
@@ -18,7 +18,7 @@ $(outdir)/%.ps.gz.omf: %.texi
 
 # Generic rule not possible?
 $(outdir)/%/%.html: $(outdir)/%.texi 
-       $(MAKEINFO) --output=$@ --css-include=$(builddir)/Documentation/texinfo.css --html $<
+       $(MAKEINFO) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
 
 
 $(outdir)/%.dvi: $(outdir)/%.texi