patch::: 1.4.0.jcn5

1.4.0.jcn5
==========

* configure: check for splitting makeinfo; small fixes for
non-splitting makeinfo doc.

* Added some missing titling (dedication, translator) and fixed ps titling
(Thanks David Arnold).

diff --git a/CHANGES b/CHANGES
index 450fb4d00460141da7a1c9821e306482050a62ed..df9b08e1a7e671afbdba50259a0342ca005cc00d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+1.4.0.jcn5
+==========
+
+* configure: check for splitting makeinfo; small fixes for
+non-splitting makeinfo doc.
+
+* Added some missing titling (dedication, translator) and fixed ps titling
+(Thanks David Arnold).
+
 1.4.0.jcn4
 ==========
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 7f91a261deb733cf356a7109f24e503c9724ecd2..862601416959c71343fb91a33ea429656360035f 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -50,12 +50,6 @@ default:
 info: $(INFO_FILES)
 
 
-# The new pretest version of makeinfo, 4.0a splits html files into their own
-# directory.  Available from
-# ftp://texinfo.org/texinfo/pretests/texinfo-4.0a.tar.gz
-SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a|b)')
-
-
 # Generic rule using % twice not possible?
 # $(outdir)/%/%.html: $(outdir)/%.texi
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
@@ -70,20 +64,24 @@ $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-interna
        -cp -f $(outdir)/lilypond-internals/index.html $@
        $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
-ifneq ($(SPLITTING_MAKEINFO),)
+
+ifeq ($(SPLITTING_MAKEINFO),yes)
 
 DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html
 
-else
+local-WWW: rm-deep-symlinks
 
-DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html
-
-local-WWW: deep-symlinks
+rm-deep-symlinks:
+       cd $(outdir) && rm -f lilypond lilypond-internals
 
+else
 
+DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html
 
 # Links referred to by Documentation index
-LILYPOND_LINKS=Reference-Manual.html Features.html Ly2dvi.html Midi2ly.html
+LILYPOND_LINKS=Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html
+
+local-WWW: deep-symlinks
 
 deep-symlinks:
        cd $(outdir) && rm -f lilypond && ln -s . lilypond

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 684a9762bff24572ded4afa3ba3c4be5304cb63f..d764ad916ca60a3dbf58d8a95dc402b6b59f7832 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -51,8 +51,8 @@ produce most complex music with LilyPond.
 This section shows how easy writing music with LilyPond actually is.  If
 you have not seen LilyPond input source before, this section is for you.
 
-The next section has a small legend of all symbols that are introduced
-here, you may want to keep an eye on that.
+The next section has a table (see @ref{Simple legend}) of all symbols
+that are introduced here, you may want to keep an eye on that.
 
 Writing music with LilyPond is explained below by a number of small
 examples.  Each example has a small piece of text; the LilyPond input

diff --git a/VERSION b/VERSION
index daf1d58564801c945757fef85f76ce4550a16b4e..21514da0c9a87789db3e3e03d492e93270b7c58f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=0
-MY_PATCH_LEVEL=jcn4
+MY_PATCH_LEVEL=jcn5
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index 2fed2f24e9a7a65b36fcd8ec583d6d550b336c2e..d313deb9c8e8180febefacbe3d0efcbc51f5eb75 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,3 @@
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
@@ -537,6 +535,29 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [
     AC_CHECK_FUNCS(gettext)
 ])
 
+AC_DEFUN(AC_STEPMAKE_MAKEINFO, [
+    AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
+    AC_MSG_CHECKING(whether makeinfo can split html by @node)
+    makeinfo --html --output=out/split <<EOF
+\input texinfo
+\input texinfo @c -*-texinfo-*-
+@setfilename split.info
+@settitle split.info
+@bye
+EOF
+    if test -d out/split; then
+       SPLITTING_MAKEINFO=yes
+       AC_MSG_RESULT(yes)
+       rm -rf out/split
+    else
+       AC_MSG_RESULT(no)
+       AC_STEPMAKE_WARN(your html documentation will be one large file)
+       rm -rf out/split
+    fi
+    AC_SUBST(SPLITTING_MAKEINFO)
+])
+
+
 AC_DEFUN(AC_STEPMAKE_MAN, [
     AC_CHECK_PROGS(GROFF, groff ditroff, -echo no groff)
     AC_CHECK_PROGS(TROFF, troff, -echo no troff)

diff --git a/config.make.in b/config.make.in
index 0529c4848f1955366efe2306a6bec93852340366..0cf0c6e36a3868be879255a777b554f56fa3d69f 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -19,6 +19,7 @@ PACKAGE_NAME = @PACKAGE_NAME@
 stepmake = @stepmake@
 CONFIGSUFFIX = @CONFIGSUFFIX@
 MAKEINFO = @MAKEINFO@
+SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 builddir = @builddir@

diff --git a/configure.in b/configure.in
index f223e91291e79eecbf8baa567d337b274161b097..af4081418ac3cb51e8b9d7643238c4ebb260a4a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -45,7 +45,8 @@ AC_CHECK_FUNCS(memmem snprintf vsnprintf gettext isinf)
 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
-AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
+AC_STEPMAKE_MAKEINFO
+
 AC_PATH_PROG(PERL, perl, error)
 
 AC_STEPMAKE_END

diff --git a/input/test/title.ly b/input/test/title.ly
index 397d6c02abd2a854ce4ea0b87a4895e731b25a9c..176829a4c5dc31aa25cce0cdbab0589d077d1698 100644 (file)
--- a/input/test/title.ly
+++ b/input/test/title.ly
@@ -1,11 +1,16 @@
 \version "1.3.146"
 \header {
   filename =  "title.ly"
+  dedication = "dedication"
   title = "Title"
   subtitle = "Subtitle"
   subsubtitle = "Subsubtitle"
   composer = "Composer (xxxx-yyyy)"
   arranger = "Arranger"
+  poet = "Poet"
+  % ugr: warning: Identifier name is a keyword: `translator'
+  % translator = "Translator"
+  texttranslator = "Translator"
   copyright = "public domain"
   enteredby = "jcn"
   source =  "urtext"

diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 49c77c451d08bc4ff6e547f556743e8e19c5be14..53fed1bb2c3ccf16b092d12f6526a7aa5de347e6 100644 (file)
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -165,6 +165,10 @@
 
 /make-lilypond-title
 {
+       currentdict /lilyponddedication known {
+               normal-font lilyponddedication set-centered
+               line-y 10 sub /line-y exch def
+       } if
        currentdict /lilypondtitle known {
                huge-bold-font lilypondtitle set-centered
                line-y 5 sub /line-y exch def
@@ -176,14 +180,27 @@
        currentdict /lilypondsubsubtitle known {
                large-bold-font lilypondsubsubtitle set-centered
        } if
+       line-y /mini-page exch def
        currentdict /lilypondcomposer known {
                large-smallcaps-font lilypondcomposer set-right
+               line-y 2 sub /line-y exch def
        } if
        currentdict /lilypondopus known {
                normal-font lilypondopus set-right
+               line-y 3 sub /line-y exch def
        } if
        currentdict /lilypondarranger known {
                normal-font lilypondarranger set-right
+               line-y 3 sub /line-y exch def
+       } if
+       currentdict /lilypondpoet known {
+               mini-page /line-y exch def
+               normal-font lilypondpoet set-left
+               line-y 3 sub /line-y exch def
+       } if
+       currentdict /lilypondtexttranslator known {
+               normal-font lilypondtexttranslator set-left
+               line-y 3 sub /line-y exch def
        } if
        currentdict /lilypondinstrument known {
                large-font lilypondinstrument set-centered

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 06d81a675a8560ab8ba0018ba1e40f3dc4dbf5e8..d313deb9c8e8180febefacbe3d0efcbc51f5eb75 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -535,6 +535,29 @@ AC_DEFUN(AC_STEPMAKE_GETTEXT, [
     AC_CHECK_FUNCS(gettext)
 ])
 
+AC_DEFUN(AC_STEPMAKE_MAKEINFO, [
+    AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
+    AC_MSG_CHECKING(whether makeinfo can split html by @node)
+    makeinfo --html --output=out/split <<EOF
+\input texinfo
+\input texinfo @c -*-texinfo-*-
+@setfilename split.info
+@settitle split.info
+@bye
+EOF
+    if test -d out/split; then
+       SPLITTING_MAKEINFO=yes
+       AC_MSG_RESULT(yes)
+       rm -rf out/split
+    else
+       AC_MSG_RESULT(no)
+       AC_STEPMAKE_WARN(your html documentation will be one large file)
+       rm -rf out/split
+    fi
+    AC_SUBST(SPLITTING_MAKEINFO)
+])
+
+
 AC_DEFUN(AC_STEPMAKE_MAN, [
     AC_CHECK_PROGS(GROFF, groff ditroff, -echo no groff)
     AC_CHECK_PROGS(TROFF, troff, -echo no troff)

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 8a3950c51ff5a95b62a37a06fbb47d5bd733fbe9..c41cb0b7386df53e76867a792234b0a0782243f5 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -11,6 +11,7 @@
 \def\makelilypondtitle
 {
   \begin{center}
+        \ifx\lilyponddedication\undefined\else{\normalfont\lilyponddedication\\}\fi
         \bfseries
         \ifx\lilypondtitle\undefined\else{\huge\lilypondtitle\\}\fi
         \ifx\lilypondsubtitle\undefined\else{\Large\lilypondsubtitle\\}\fi
@@ -21,6 +22,7 @@
   \edef\saveparskip{\parskip}\parskip-5mm
   \begin{minipage}[t]{0.45\textwidth}
         \ifx\lilypondpoet\undefined\else{\lilypondpoet\\}\fi
+        \ifx\lilypondtexttranslator\undefined\else{\lilypondtexttranslator\\}\fi
         \ifx\lilypondmeter\undefined\else{\lilypondmeter\\}\fi
   \end{minipage}\hspace*{\fill}
   \begin{minipage}[t]{0.45\textwidth}