Revert "Always use Lily current version number in docs"

This reverts commit 351c128ea97502ed59e912249211734957877814.

diff --git a/Documentation/user/README.txt b/Documentation/user/README.txt
index ae345e03d089d67c16ce0a3eb5c8025a119731f0..6b39a974a348dcfb67b4ca6d2bc0b1cb5019015d 100644 (file)
--- a/Documentation/user/README.txt
+++ b/Documentation/user/README.txt
@@ -11,7 +11,7 @@ General policy: policy.txt
 convert-ly -e --from=... --to=... --no-version *.itely
 
 % to find the current version number,
-grep "version \"" fundamental.itely
+grep "version \"" tutorial.itely
 
 Please don't forget updating translated docs (in LANGS/user) too!
 

diff --git a/Documentation/user/fundamental.itely b/Documentation/user/fundamental.itely
index 1ccf9bcf02ccd731e9e2289c91e7dd478cec2d01..1e56b0e4f250f3d2d11292d75891b65d8fdbf93f 100644 (file)
--- a/Documentation/user/fundamental.itely
+++ b/Documentation/user/fundamental.itely
@@ -40,7 +40,7 @@ description of the input format, see @ruser{File structure}.
 A basic example of a lilypond input file is
 
 @example
-\version @w{"@version{}"}
+\version "2.11.38"
 \score @{
   @var{...compound music expression...}  % all the music goes here!
   \header @{ @}
@@ -1739,7 +1739,7 @@ cello.  In this case, we would start with @q{Notes and lyrics} (for the
 soprano part).
 
 @example
-\version @w{"@version{}"}
+\version "2.11.38"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -1767,7 +1767,7 @@ text = \lyricmode @{
 Now we want to add a cello part.  Let's look at the @q{Notes only} example:
 
 @example
-\version @w{"@version{}"}
+\version "2.11.38"
 melody = \relative c' @{
   \clef treble
   \key c \major
@@ -1804,7 +1804,7 @@ celli normally use bass clef.  We'll also give the cello some
 different notes.
 
 @example
-\version @w{"@version{}"}
+\version "2.11.38"
 sopranoMusic = \relative c' @{
   \clef treble
   \key c \major
@@ -1873,7 +1873,7 @@ This looks a bit messy; the indentation is messed up now.  That is
 easily fixed.  Here's the complete soprano and cello template.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
+\version "2.11.37"
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major
@@ -1921,6 +1921,7 @@ from Handel's Messiah:
 
 @c The following should appear as music without code
 @lilypond[quote,ragged-right]
+\version "2.11.38"
 global = { \key d \major \time 4/4 }
 sopMusic = \relative c'' {
   \clef "treble"
@@ -2192,7 +2193,7 @@ music definitions and one to define the time signature
 and key:
 
 @example
-\version @w{"@version{}"}
+\version "2.11.38"
 \header @{
   title = "Jesu, meine Freude"
   composer = "J S Bach"

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index f0af1fcf1706209bb3712cefe55c24152ec9504a..86b274f9cfd3ef85640f15cd52d039869c3dc56d 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -105,10 +105,9 @@ directory as this file.)
 Save the code above to a file called @file{lilybook.lytex}, then in a
 terminal run
 
-@c keep space after @version{} so TeX doesn't choke
 @example
 lilypond-book --output=out --pdf lilybook.lytex
-@emph{lilypond-book (GNU LilyPond) @version{} }
+@emph{lilypond-book (GNU LilyPond) 2.11.37}
 @emph{Reading lilybook.lytex...}
 @emph{..lots of stuff deleted..}
 @emph{Compiling lilybook.tex...}

diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/user/lilypond-learning.tely
index fac164092e8d9d05d83d0151a6edb38f0b9afda8..c1e811970a73750e823db5657674879a4d2586ed 100644 (file)
--- a/Documentation/user/lilypond-learning.tely
+++ b/Documentation/user/lilypond-learning.tely
@@ -10,8 +10,6 @@
 @documentencoding UTF-8
 @documentlanguage en
 
-@include macros.itexi
-
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -66,7 +64,21 @@ Free Documentation License''.
 
 @vskip 20pt
 
-For LilyPond version @version{}
+@lilypond[ragged-right]
+\score {
+  \context Lyrics {
+    \override Score.RehearsalMark #'self-alignment-X = #LEFT
+    \override Score.RehearsalMark #'font-size = #-2
+    \mark #(ly:export (string-append
+      "(For LilyPond version " (lilypond-version) ")"))
+    s2
+  }
+  \layout {
+    indent = 0.0\pt
+  }
+}
+@end lilypond
+
 @end titlepage
 
 @copying
@@ -102,7 +114,10 @@ Free Documentation License''.
 @top GNU LilyPond --- learning manual
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the learning manual for GNU LilyPond version @version{}.
+This is the learning manual for GNU LilyPond 2.11.x series.
+@ifhtml
+(See the bottom of this page for the exact version number).
+@end ifhtml
 
 @cindex web site
 @cindex URL
@@ -132,6 +147,8 @@ Appendices
 @contents
 
 
+@include macros.itexi
+
 @include preface.itely
 @include introduction.itely
 @include tutorial.itely

diff --git a/Documentation/user/lilypond-program.tely b/Documentation/user/lilypond-program.tely
index 18ced37734a1374eb602b478a56c6bfcf53fb6bb..6fa9f3900be20626275a638c169fc08baee68217 100644 (file)
--- a/Documentation/user/lilypond-program.tely
+++ b/Documentation/user/lilypond-program.tely
@@ -10,8 +10,6 @@
 @documentencoding UTF-8
 @documentlanguage en
 
-@include macros.itexi
-
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -66,7 +64,21 @@ Free Documentation License''.
 
 @vskip 20pt
 
-For LilyPond version @version{}
+@lilypond[ragged-right]
+\score {
+  \context Lyrics {
+    \override Score.RehearsalMark #'self-alignment-X = #LEFT
+    \override Score.RehearsalMark #'font-size = #-2
+    \mark #(ly:export (string-append
+      "(For LilyPond version " (lilypond-version) ")"))
+    s2
+  }
+  \layout {
+    indent = 0.0\pt
+  }
+}
+@end lilypond
+
 @end titlepage
 
 @copying
@@ -102,7 +114,10 @@ Free Documentation License''.
 @top GNU LilyPond --- program usage
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the program usage manual for GNU LilyPond version @version{}.
+This is the program usage manual for GNU LilyPond 2.11.x series.
+@ifhtml
+(See the bottom of this page for the exact version number).
+@end ifhtml
 
 @cindex web site
 @cindex URL
@@ -128,6 +143,8 @@ Appendices
 @contents
 
 
+@include macros.itexi
+
 @include install.itely
 @include setup.itely
 @include running.itely

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 7c203800d781e15f849a179d8784cb13fa1dda17..0631951f5ae237ab2a5e22c3f9c1008e4eea1073 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -10,8 +10,6 @@
 @documentencoding UTF-8
 @documentlanguage en
 
-@include macros.itexi
-
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -100,7 +98,21 @@ Free Documentation License''.
 
 @vskip 20pt
 
-For LilyPond version @version{}
+@lilypond[ragged-right]
+\score {
+  \context Lyrics {
+    \override Score.RehearsalMark #'self-alignment-X = #LEFT
+    \override Score.RehearsalMark #'font-size = #-2
+    \mark #(ly:export (string-append
+      "(For LilyPond version " (lilypond-version) ")"))
+    s2
+  }
+  \layout {
+    indent = 0.0\pt
+  }
+}
+@end lilypond
+
 @end titlepage
 
 @copying
@@ -136,7 +148,10 @@ Free Documentation License''.
 @top GNU LilyPond --- The music typesetter
 @c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the user manual for GNU LilyPond version @version{}.
+This is the user manual for GNU LilyPond 2.11.x series.
+@ifhtml
+(See the bottom of this page for the exact version number).
+@end ifhtml
 
 @cindex web site
 @cindex URL
@@ -172,6 +187,8 @@ Appendices
 @contents
 
 
+@include macros.itexi
+
 @include notation.itely
 @include specialist.itely
 

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index dd777b9367519932977c12ec5a9fe0e7c62ab998..765bd4aff14c58efd9975298da541a818ef53f38 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1585,7 +1585,7 @@ The @code{\version} statement records the version of LilyPond that
 was used to write the file:
 
 @example
-\version @w{"@version{}"}
+\version "2.11.38"
 @end example
 
 @noindent
@@ -1607,7 +1607,7 @@ main music expression; the @code{\header} block is usually placed
 underneath the @ref{Version number}.
 
 @example
-\version @w{"@version{}"}
+\version "2.11.38"
 \header @{
   title = "Symphony"
   composer = "Me"

diff --git a/Documentation/user/working.itely b/Documentation/user/working.itely
index 216f577e89535a0f2f4d71a3b9322acfc564fc56..4f8820da016d072f01a86d28713f352daecd4baa 100644 (file)
--- a/Documentation/user/working.itely
+++ b/Documentation/user/working.itely
@@ -73,7 +73,7 @@ templates contain @code{\version} information.  We
 highly recommend that you always include the @code{\version}, no matter
 how small your file is.  Speaking from personal experience, it's
 quite frustrating to try to remember which version of LilyPond you were
-using a few years ago.  @command{convert-ly} requires you to declare
+using a few years ago.  @code{convert-ly} requires you to declare
 which version of LilyPond you used.
 
 @item @strong{Include checks}: @ruser{Bar and barnumber checks},
@@ -536,7 +536,7 @@ file with @code{\include "../global.ly"}, which contains
 
 @example
 %%%   global.ly
-\version @w{"@version{}"}
+\version "2.11.38"
 #(ly:set-option 'point-and-click #f)
 \include "../init/init-defs.ly"
 \include "../init/init-layout.ly"

diff --git a/Documentation/user/writing-texinfo.txt b/Documentation/user/writing-texinfo.txt
index 7913ed0ad76407f366f13ed43d7e14c82b462021..4c988f754eb83724971cff8d21f78d3121d2771f 100644 (file)
--- a/Documentation/user/writing-texinfo.txt
+++ b/Documentation/user/writing-texinfo.txt
@@ -161,19 +161,6 @@ commands.
 
   Do not use @itemize @bullet.
 
-* To get LilyPond version, use @version{} (this does not work inside
-  LilyPond snippets).  If you write "@version{}" (enclosed with
-  quotes), or generally if @version{} is not followed by a space,
-  enclose it with
-
-  @w{ ... }
-
-  e.g.
-
-  @w{"@version{}"}
-
-  to prevent an ugly line break in PDF output.
-
 
 %%%%% SYNTAX SURVEY
 

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 4ee7cefa474dac6762da3b9d4aef10579c0fde2e..d36ff83b81db972664de69f49987e9341cab6a6c 100644 (file)
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -9,10 +9,9 @@ OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
 GENERATE_OMF = $(PYTHON) $(buildscript-dir)/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
-TEXI2PDF_FLAGS += --command '@set version $(TOPLEVEL_VERSION)'
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 
-MAKEINFO_FLAGS = --enable-encoding -D 'version $(TOPLEVEL_VERSION)'
+MAKEINFO_FLAGS = --enable-encoding
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)