From d0ef148c1aaa389a403549e7ffa6e918e37eb389 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 27 Sep 2004 18:39:24 +0000 Subject: [PATCH] * stepmake/stepmake/texinfo-rules.make: * Documentation/GNUmakefile: --srcdir build fixes. * input/test/coriolan-margin.ly: Put papersize settings in \bookpaper. --- ChangeLog | 5 ++ Documentation/user/GNUmakefile | 8 +-- buildscripts/guile-gnome.sh | 20 ++++--- input/test/coriolan-margin.ly | 89 +++++++++++++++------------- stepmake/stepmake/texinfo-rules.make | 4 +- 5 files changed, 72 insertions(+), 54 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f1e6acbc2..9243bbfd81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-09-27 Jan Nieuwenhuizen + * 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 6fbd2932f5..4954461582 100644 --- 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 238abdc67c..341a9c77a0 100644 --- 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 <> - \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 853ecaa6c1..c43ec1aef0 100644 --- 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 -- 2.39.2