From ef31ff6007036448a1f18061b007a71815c1d7b0 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Tue, 1 Mar 2005 13:29:25 +0000
Subject: [PATCH] *** empty log message ***
---
ChangeLog | 7 +++++++
Documentation/topdocs/NEWS.tely | 8 ++++++--
Documentation/user/GNUmakefile | 5 ++---
ly/init.ly | 1 -
ly/titling-init.ly | 11 +++++++++++
scm/define-markup-commands.scm | 2 +-
scm/page-layout.scm | 10 ----------
scm/titling.scm | 9 ++++++---
8 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a7c56f3cb7..c259deec06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-01 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * scm/define-markup-commands.scm (with-url): oops. use Y extent
+ for Y.
+
+ * ly/titling-init.ly (tagline): put default tagline in \paper
+
2005-03-01 Jan Nieuwenhuizen <janneke@gnu.org>
* tex/GNUmakefile $(outdir)/latin1.enc: Build fix:
diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 694cfc1ba0..5eee3b6332 100644
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -41,6 +41,10 @@ See
the section Point and click in he user manual.
@end ifnothtml
+@item
+White mensural ligatures now conform more closely to Renaissance
+usage.
+
@item
With the new @code{tieWaitForNote} property, arpeggios may be written
@@ -65,8 +69,8 @@ Individual objects may be assigned colors, for example,
The PostScript backend is now used by default. This backend requires
less machinery to run, and gives more consistent results.
-Due bugs in GhostScript's PDF handling, it is recommended to upgrade
-to GhostScript 8.x.
+Due to bugs in GhostScript's PDF handling, it is recommended to
+upgrade to GhostScript 8.x.
@item
Separator slashes may be inserted between systems in a score. For an
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index d88c5eb211..a48e457e46 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -65,7 +65,6 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
@echo "or add something like that to the postinstall script."
@echo
else
-
-$(INSTALL) -d $(DESTDIR)$(package_infodir)
-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
install-info --info-dir=$(infodir) $(outdir)/lilypond.info
@@ -187,7 +186,7 @@ $(outdir)/%.eps: %.png
DEEP_HTML_FILES =\
$(outdir)/lilypond/index.html\
$(outdir)/lilypond-internals/index.html
-
+
else
# Links referred to by Documentation index
@@ -262,7 +261,7 @@ local-clean: local-delete
local-delete:
-for i in $$(seq 0 9); do \
- for j in dvi eps eps.bbox eps.trans log png tex; do \
+ for j in dvi eps eps.bbox eps.trans eps.trans.ps ps log png tex; do \
rm -f $(outdir)/lily-$$i*$$j; \
done; \
done
diff --git a/ly/init.ly b/ly/init.ly
index 72c57c1bf1..50a64fc31b 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -9,7 +9,6 @@
#(ly:set-option 'new-relative)
-#(ly:set-point-and-click #f)
#(define toplevel-scores '())
#(define $globalheader #f)
#(define version-seen? #f)
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 20c3744589..f4c1ee24d4 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -7,6 +7,17 @@ slashSeparator = \markup {
\raise #0.7 \beam #2.0 #0.5 #0.48
}
+
+tagline = \markup {
+ \with-url
+ #"http://lilypond.org/pdflink/"
+ \line {
+ "Engraved by LilyPond"
+ #(ly:export (lilypond-version))
+ "-"
+ "www.lilypond.org"
+ }
+}
bookTitleMarkup = \markup {
\column {
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 9a47e11820..5f4fa4b7b7 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -23,7 +23,7 @@ the PDF backend."
(let*
((stil (interpret-markup layout props arg))
(xextent (ly:stencil-extent stil X))
- (yextent (ly:stencil-extent stil X))
+ (yextent (ly:stencil-extent stil Y))
(old-expr (ly:stencil-expr stil))
(url-expr (list 'url-link url `(quote ,xextent) `(quote ,yextent))))
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index f65c8744dc..5217ed4ea2 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -29,16 +29,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define TAGLINE
- (make-line-markup
- (list
- (make-simple-markup (string-append "Engraved by LilyPond " (lilypond-version)))
- (make-simple-markup "-")
- (make-with-url-markup "http://lilypond.org"
- (make-typewriter-markup (make-simple-markup "www.lilypond.org"))
-
- ))))
-
(define (page-headfoot layout scopes number sym sepsym dir last?)
"Create a stencil including separating space."
(let* ((header-proc (ly:output-def-lookup layout sym))
diff --git a/scm/titling.scm b/scm/titling.scm
index c41dfb8ee2..b129166ac3 100644
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -37,12 +37,15 @@ page:last?, page:page-number-string and page:page-number
alist))
alists))
(tagline (ly:modules-lookup scopes 'tagline))
+ (default-tagline (ly:output-def-lookup layout 'tagline))
(pgnum-alist
(list
- (cons 'header:tagline (if (markup? tagline)
- tagline
- TAGLINE))
+ (cons 'header:tagline
+ (cond
+ ((markup? tagline) tagline)
+ ((markup? default-tagline) default-tagline)
+ (else "")))
(cons 'page:last? last?)
(cons 'page:page-number-string
(number->string page-number))
--
2.39.5