From 89b7e8eb4e8141e2b9b294a93f90665314a8349f Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 28 Mar 2004 12:54:08 +0000
Subject: [PATCH] ($(outdir)/%.texi): use variable for outdir.

---
 ChangeLog                              |  2 ++
 Documentation/user/music-glossary.tely |  6 +++---
 Documentation/user/preface.itely       |  4 ++--
 input/regression/span-bar.ly           | 15 ++++++++++++---
 make/ly-rules.make                     |  4 ++--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6b69ee620..5608eadf11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-03-28  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* make/ly-rules.make ($(outdir)/%.texi): use variable for outdir.
+
 	* input/mutopia/W.A.Mozart/mozart-hrn-3.ly: Mozart died in 1791
 
 	* python/lilylib.py (command_name): don't return 1st path
diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 8df5eec545..1d12f9c945 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -965,7 +965,7 @@ music of the baroque era, has been one of the most popular polyphonic
 composition methods.
 
 @lilypond[staffsize=11]
-\override Score.TimeSignature   #'style =\turnOff
+\set Score.TimeSignature =\turnOff
 \notes\context PianoStaff <<
   \context Staff = SA \relative c' {
     \key bes \major
@@ -2657,8 +2657,8 @@ The briefest intelligible and self-contained fragment of a musical theme or
 subject.
 
 @lilypond
-\override Score.TimeSignature   #'style = \turnOff
-%\override Score.TextScript   #'font-style = #'large
+\set Score.TimeSignature = \turnOff
+%\override Score.TextScript #'font-style = #'large
 \notes\relative c'' {
   \time 4/4
   \key g \major
diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index 95793ff221..ea788668ea 100644
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -16,12 +16,12 @@
 @unnumberedsec Preface to version 2.2
 
 During the 2.1 development cycle, the cleanup of the existing features
-has continued unabated. Major areas of change are: orchestral
+has continued unabated. Major areas of change are orchestral
 notation, lyrics formatting and font size handling.
 
 Han-Wen and Jan
 
-Utrecht/Eindhoven, The Netherlands, March 2003. 
+Utrecht/Eindhoven, The Netherlands, March 2004. 
 
 
 @node Preface to version 2.0
diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index 68ce1f8638..19f191e85e 100644
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -2,22 +2,31 @@
 \header {
 texidoc = "Span bars are drawn only between staff bar lines. By setting 
 bar lines to transparent, they are shown only between systems.
+
+Setting @code{SpanBar} transparent does the removes the barlines
+between systems.
+ 
 "
 }
 
 \score {
  \notes \relative c' \new StaffGroup <<
- \new Staff { a1 a1 a1}
+ \new Staff {
+     \override Score.BarLine #'transparent = ##t
+     a1 a1
+     \revert Score.BarLine #'transparent = ##t
+     \overr Score.SpanBar #'transparent = ##t
+     a1 a1}
   \new Lyrics \lyrics <<
    { bla1 die bla }
    { foo bar foo }
   >>
-  \new Staff { f1 f1 f1}
+  \new Staff {
+      f1 f1 f1 f1}
  >>
  \paper {
   \context {
    \StaffContext
-   \override BarLine #'transparent = ##t
   }
   raggedright =##t 
  }
diff --git a/make/ly-rules.make b/make/ly-rules.make
index adadab0942..0e899a7771 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -10,13 +10,13 @@ $(outdir)/%.latex: %.doc
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely
 	if [ -f $@ ]; then chmod a+w $@; fi
-	rm -f $$(grep -LF '\lilypondend' out/lily-*.tex 2>/dev/null)
+	rm -f $$(grep -LF '\lilypondend' $(outdir)/lily-*.tex 2>/dev/null)
 	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
 	chmod -w $@
 
 $(outdir)/%.texi: $(outdir)/%.tely
 	if [ -f $@ ]; then chmod a+w $@; fi
-	rm -f $$(grep -LF '\lilypondend' out/lily-*.tex 2>/dev/null)
+	rm -f $$(grep -LF '\lilypondend' $(outdir)/lily-*.tex 2>/dev/null)
 	$(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $<
 #
 # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
-- 
2.39.2