From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 6 Aug 2003 01:42:30 +0000 (+0000)
Subject: * scm/output-tex.scm (comment): idem.
X-Git-Tag: release/1.8.0~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=833233fa945e8a00fc1cd814b91417960948dbb4;p=lilypond.git

* scm/output-tex.scm (comment): idem.

* scm/output-pdftex.scm: remove GUILE 1.4 glue

* scm/music-functions.scm (make-lyric-event): new function

* scm/lily.scm (lilypond-version): new function

* input/test/version-output.ly: new file.

* Documentation/user/lilypond.tely: add version number to
front-page.
---

diff --git a/ChangeLog b/ChangeLog
index b6c7ac03de..70d88fae87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2003-08-06  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* Documentation/user/*.tely: remove WEBTITLE
+
+	* scm/output-tex.scm (comment): idem.
+
+	* scm/output-pdftex.scm: remove GUILE 1.4 glue
+
+	* scm/music-functions.scm (make-lyric-event): new function
+
+	* scm/lily.scm (lilypond-version): new function
+
+	* input/test/version-output.ly: new file.
+
+	* Documentation/user/lilypond.tely: add version number to
+	front-page.
+
 2003-08-05  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* input/test/midi-scales.ly: Reformat to match midi2ly output again.
diff --git a/Documentation/user/glossary.html.in b/Documentation/user/glossary.html.in
index d0c91633f1..086c9d9f23 100644
--- a/Documentation/user/glossary.html.in
+++ b/Documentation/user/glossary.html.in
@@ -1,9 +1,8 @@
 <!meta http-equiv=refresh content="0; url='music-glossary.html'">
 
-<!--- @WEB-TITLE@=Music Glossary moved --->
 
 <h2>Music glossary has moved</h2>
 
 The new location is: <a href='music-glossary.html'>music-glossary.html</a>.
 
-<p>Please update your links.  Sorry for the inconvenience.
\ No newline at end of file
+<p>Please update your links.  Sorry for the inconvenience.
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 844c805fe0..d9084de8d8 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -3,9 +3,6 @@
 @settitle GNU LilyPond
 
 
-@html
-<!--- @@WEB-TITLE@@=User Manual --->
-@end html
 
 @ignore
 Distributions will want to install lilypond.info doing:
@@ -90,6 +87,23 @@ Copyright @copyright{} 1999--2003 by the authors
   A copy of the license is included in the section entitled ``GNU
   Free Documentation License''.
 
+@vskip 20pt
+
+  
+@lilypond[singleline]
+\score { \context Lyrics \notes {
+    \property Score.RehearsalMark \set #'self-alignment-X = #LEFT
+
+\mark #(ly:export    (string-append "(For LilyPond version "
+(lilypond-version) ")"))
+s2
+ }
+ \paper { indent = 0.0\pt
+ raggedright   = ##t 
+ }
+}
+@end lilypond
+  
 
 @end titlepage
 
diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 9dbdf7dd5a..05bc15a38b 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -2,9 +2,6 @@
 @settitle Music Glossary
 @setfilename music-glosssary.info
 
-@html
-<!--- @@WEB-TITLE@@=Music Glossary --->
-@end html
 
 @ifhtml
 This document is also available in @uref{music-glossary.ps.gz,gzipped
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 8cd3996b47..6f76a9bba4 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -10,11 +10,6 @@
 @node Notation manual
 @chapter Notation manual
 
-@html
-<!--- @@WEB-TITLE@@=Notation manual --->
-@end html
-
-
 @menu
 * Note entry::                  
 * Easier music entry::          
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 4fe492a4f5..b9f8a5a262 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -8,9 +8,6 @@
 @node Tutorial
 @chapter Tutorial
 
-@html
-<!--- @@WEB-TITLE@@=Tutorial --->
-@end html
 
 
 Using LilyPond comes down to encoding music in an input file. After
@@ -1605,15 +1602,15 @@ Then, an individual part is made by putting the following in a file:
 @end example
 The @code{\include} command substitutes the contents of the file at
 this position in the file, so that @code{hornNotes} is defined
-afterwards.  Since the horn is tuned in F, the @code{\transpose}
-command is used. The code @code{\transpose c' f} indicates that the
+afterwards.  The code @code{\transpose f c'} indicates that the
 argument, being @code{\hornNotes}, should be transposed by a fifth
-downwards: the @code{c'} becomes a @code{f}. The transposition can be
-seen in the following output:
+downwards: sounding @code{f} is denoted by notated @code{c'}, which
+corresponds with tuning of a normal French Horn in F. The
+transposition can be seen in the following output:
 
 @lilypond[singleline]
 \score {
-  \notes \transpose c' f  \notes \relative c' {
+  \notes \transpose f c' \notes \relative c {
   \time 2/4
   r4 f8 a cis4 f e d
 }
@@ -1640,7 +1637,7 @@ Prepending the rest and the property setting above, leads to the
 following result:
 
 @lilypond[singleline]
-\score {\notes { \transpose c' f \relative c' { \time 2/4
+\score {\notes { \transpose f c' \relative c { \time 2/4
 \property Score.skipBars = ##t 
         R2*3
     r4 f8 a cis4 f e d } }}
diff --git a/GNUmakefile.in b/GNUmakefile.in
index e66750f493..8ad5ccc5a6 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -62,7 +62,7 @@ local-WWW-post:
 	cd $(builddir) && find Documentation input \
 		$(web-ext:%=-path '*/out-www/*.%' -or) -false \
 		> $(outdir)/weblist
-	echo '<META HTTP-EQUIV="refresh" content="1;URL=Documentation/out-www/index.html">' > $(builddir)/index.html
+	echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/out-www/index.html">' > $(builddir)/index.html
 	echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(builddir)/index.html
 	cd $(builddir) && ls *.html >> $(outdir)/weblist
 	cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
diff --git a/input/test/version-output.ly b/input/test/version-output.ly
new file mode 100644
index 0000000000..db2e825d30
--- /dev/null
+++ b/input/test/version-output.ly
@@ -0,0 +1,16 @@
+\version "1.7.30"
+
+\header {
+    texidoc  = "By putting the output of @code{lilypond-version}
+  into a lyric, we can print the version number in a score,
+or a lilypond-book document."
+    }
+
+\score { \context Lyrics \notes {
+    \property Score.RehearsalMark \set #'self-alignment-X = #LEFT
+    \mark #(ly:export (string-append "Processed with LilyPond version " (lilypond-version)))
+    s2
+  }
+}
+
+
diff --git a/scm/lily.scm b/scm/lily.scm
index 0ed4c0e6ce..07c35bc001 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -14,7 +14,10 @@
 	     )
 
 ;;; General settings
-;; debugging evaluator is slower.
+;;; debugging evaluator is slower.  This should
+;;; have a more sensible default.
+
+
 
 (debug-enable 'debug)
 ;(debug-enable 'backtrace)
@@ -34,6 +37,16 @@
 
 (define-public point-and-click #f)
 
+(define-public (lilypond-version)
+  (string-join
+   (map (lambda (x) (if (symbol? x)
+			(symbol->string x)
+			(number->string x)))
+		(ly:version))
+   "."))
+
+
+
 ;; cpp hack to get useful error message
 (define ifdef "First run this through cpp.")
 (define ifndef "First run this through cpp.")
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 81ce5251a0..50a0dd8160 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -230,6 +230,7 @@ i.e.  this is not an override"
     m
     ))
 
+
 (define-public (make-nonevent-skip dur)
   (let*  ((m (make-music-by-name 'NonEventSkip)))
     (ly:set-mus-property! m 'duration dur)
@@ -401,6 +402,13 @@ Rest can contain a list of beat groupings
       m
   ))
 
+(define-public (make-lyric-event string duration)
+  (let* ((m (make-music-by-name 'LyricEvent)))
+
+    (ly:set-mus-property! m 'duration duration)
+    (ly:set-mus-property! m 'text string)
+    m))
+
 (define-public (make-span-event type spandir)
   (let* (
 	 (m (make-music-by-name  type))
@@ -417,6 +425,8 @@ Rest can contain a list of beat groupings
 	(set-mus-properties! m (cdr alist)))
   ))
 
+
+
 (define-public (music-separator? m)
   "Is M a separator?"
   (let* ((ts (ly:get-mus-property m 'types )))
diff --git a/scm/output-pdftex.scm b/scm/output-pdftex.scm
index 96e576ffba..f89cda7c9d 100644
--- a/scm/output-pdftex.scm
+++ b/scm/output-pdftex.scm
@@ -93,19 +93,11 @@
   ""
   )
 
-(if (or (equal? (minor-version) "4.1")
-	(equal? (minor-version) "4")
-	(equal? (minor-version) "3.4"))
-    (define (embedded-pdf expr)
-      (let ((ps-string
-	     (with-output-to-string
-	       (lambda () (pdf-output-expression expr (current-output-port))))))
-	(string-append "\\embeddedpdf{" ps-string "}")))
-    (define (embedded-pdf expr)
-      (let
-	  ((os (open-output-string)))
-	(pdf-output-expression expr os)
-	(string-append "\\embeddedpdf{" (get-output-string os) "}"))))
+(define (embedded-pdf expr)
+  (let
+      ((os (open-output-string)))
+    (pdf-output-expression expr os)
+    (string-append "\\embeddedpdf{" (get-output-string os) "}")))
 
 
 (define (comment s)
diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 408319655b..38612c8a08 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -138,20 +138,12 @@
   ""
   )
 
-(if (or (equal? (minor-version) "4.1")
-	(equal? (minor-version) "4")
-	(equal? (minor-version) "3.4"))
-    (define (embedded-ps expr)
-      (let ((ps-string
-	     (with-output-to-string
-	       (lambda () (ps-output-expression expr (current-output-port))))))
-	(string-append "\\embeddedps{" ps-string "}")))
-    (define (embedded-ps expr)
-      (let
-	  ((os (open-output-string)))
-	(ps-output-expression expr os)
-	(string-append "\\embeddedps{" (get-output-string os) "}"))))
-
+(define (embedded-ps expr)
+  (let ((ps-string
+	 (with-output-to-string
+	   (lambda () (ps-output-expression expr (current-output-port))))))
+    (string-append "\\embeddedps{" ps-string "}")))
+  
 (define (comment s)
   (string-append "% " s "\n"))