(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).

diff --git a/ChangeLog b/ChangeLog
index db04109464a76bb7c487fe5b3544c46ecfb3b5b8..7ea4eb089489460ba2a892246ba82ab4bd4c7158 100644 (file)
--- 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 ca30d735f28ba38f2cdcdc072dbfb4fa750fc885..345bdf02f8365ebfba722dafce7b5eb8db5c8b32 100644 (file)
--- 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 1b108dfccc8366ecaf2fae3a7467fae9b569fd14..66e3aaddc42a77620636b49fa7fc94d5574b62d0 100644 (file)
--- 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