From 7aef538431a3e242325aee42b9e073b9146f5c94 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 19 Nov 2004 00:48:43 +0000
Subject: [PATCH] (install-WWW): Invoke install-info, so that when building the
 documentation, info with images are installed. (final-install): Fix
 description.  Mention sourcing of login scripts (instead of running).

---
 ChangeLog      |  8 +++++++-
 GNUmakefile.in | 11 ++++++-----
 scm/font.scm   | 15 ++-------------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db04109464..7ea4eb0894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-19  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* GNUmakefile.in (install-WWW): Invoke install-info, so that when
+	building the documentation, info with images are installed.
+	(final-install): Fix description.  Mention sourcing of login
+	scripts (instead of running).
+
 2004-11-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* Debian lmodern support.  Note that LilyPond will issue warnings
@@ -12,7 +19,6 @@
 	
 	* configure.in: Test for and accept lmodern if EC fonts not found.
 
-	* Debian lmodern support.
 	* scm/framework-tex.scm (font-load-command): TeX font name
 	mangling for latin1 encoded cork-lm fonts.
 	(convert-to-ps): Load lm.map if available.
diff --git a/GNUmakefile.in b/GNUmakefile.in
index ca30d735f2..345bdf02f8 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -45,6 +45,7 @@ install-WWW:
 	tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
 # install-WWW does not recurse; fake it visiting Documentation/user manually
 	$(MAKE) -C Documentation/user local-install-WWW
+	$(MAKE) -C Documentation/user install-info
 
 web-install:
 	$(MAKE) out=www install-WWW
@@ -59,11 +60,11 @@ local-install:
 	$(INSTALL) -d $(local_lilypond_datadir)
 
 final-install:
-	@echo
-	@echo " *** Before running, buildscripts/out/lilypond-{profile,login}"
-	@echo " *** must be run. You're advised to source these scripts from your "
-	@echo " *** login scripts. For more information, see Invoking LilyPond in the manual."
-	@echo
+	@echo '*** Before using LilyPond, the contents of one of the login scripts'
+	@echo '*** buildscripts/out/lilypond-{profile,login} should be sourced.'
+	@echo '*** LilyPond should have been installed to do that automatically'
+	@echo '*** when you log in.  So, please log out now and log in again.'
+	@echo '*** For more information see Invoking LilyPond in the manual.'
 
 web-ext = gz html midi pdf png txt ly
 
diff --git a/scm/font.scm b/scm/font.scm
index 1b108dfccc..66e3aaddc4 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -245,19 +245,7 @@
 		  ,(delay (ly:font-load "cmtt10"))
 		  ,(delay (ly:font-load "cmtt12"))))))))
 
-
-
-;;; lmodern: super-cm using metapost
-;;; lm.map: Reencoding, at fontlevel for TeX ?:
-;;; cork-lmb10 LMRomanDemi10-Regular "enccorklm ReEncodeFont" <cork-lm.enc <lmb10.pf
-;;;  
-;;; super-cm, aka lmodern (on Debian) seems rather broken:
-;;; * no usable TFM files  (no lmr10.tfm, only cork-lmr10.tfm)
-;;; * broken AFM files:
-;;;    - invalid keyword 'Generated'
-;;;    - lists FontEncoding Fontspecific  -- duh
-;;  revert to ec-fonts-mftraced for now
-;;; make this easily switchable?
+;; Debian lmodern font support.
 (define-public (add-cork-lm-fonts node factor)
   (for-each
    (lambda (x)
@@ -301,6 +289,7 @@
 		  ,(delay (ly:font-load "lmtt10"))
 		  ,(delay (ly:font-load "lmtt12"))))))))
 
+;; ec-fonts-mftraced font support.
 (define-public (add-ec-fonts node factor)
   (for-each
    (lambda (x) (add-font node
-- 
2.39.5