* cygwin/mknetrel: Install image links (backportme).

* Documentation/user/GNUmakefile (local-install-info): Activate
actual installing of image links (backportme).

diff --git a/ChangeLog b/ChangeLog
index e045884dc69e9aaa496bff6bfc8e1ef091a27b9f..ff81165783ae78ebb0697008b2aab27aa5bdee83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * cygwin/mknetrel: Install image links (backportme).
+
+       * Documentation/user/GNUmakefile (local-install-info): Activate
+       actual installing of image links (backportme).
+
 2004-04-30  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * Documentation/user/notation.itely (Measure repeats): Removed

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 27b5e6d53b6086189f1bd498b5c763560456f490..ad2247c9f66a860ee865f9090ba3174cc7565be4 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -43,8 +43,10 @@ ifeq ($(out),www)
 # Viewawble with a recent Emacs, doing: M-x info out-www/lilypond.info
 
 #info: $(INFO_FILES)
-    # Cancel the special, non-image info generation rule that skips images:
-    $(outdir)/%.info: $(outdir)/%.nexi
+
+# Cancel the special, non-image info generation rule that skips images:
+$(outdir)/%.info: $(outdir)/%.nexi
+
 local-install-info: install-info info
        -$(INSTALL) -d $(DESTDIR)$(package_infodir)
 ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
@@ -53,11 +55,11 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 ## builder or packager.
        @echo "***"
        @echo "For images in the INFO docs to work, do: "
-       @echo "    (cd $(package_infodir) && ln -sf ../../doc/lilypond/$(TOPLEVEL_VERSION)/Documentation/user/out-www/*png .)"
+       @echo "    (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/out-www/*png .)"
        @echo "or add something like that to the postinstall script."
        @echo "***"
 else
-       @echo "    (cd $(package_infodir) && ln -sf $(local_package_docdir)/Documentation/user/out-www/*png .)"
+       (cd $(package_infodir) && ln -sf $(local_package_docdir)/Documentation/user/out-www/*png .)
 endif
 
 local-uninstall-WWW:

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 49954d4f5f73bbfd5eff1c47e85e18a8d3a8f3e5..a782c521a8198cc11fe7448c3d163228f04c8c47 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -166,4 +166,7 @@ postinstall () {
 
     #cd $inst-doc/$packagedocdir &&
     #ln -s $(find html/Documentation -name '*.ps.gz') .
+
+    install -d -m755 $inst-doc/$infodir/lilypond
+    cd $inst-doc/$infodir/lilypond && ln -sf ../../doc/$base-$ver/Documentation/user/out-www/*png .
 }

diff --git a/scm/paper.scm b/scm/paper.scm
index cf47f42b35beae640c81e423bd8826b39547327c..beb11e087eaf0ae447df28091433939342f17bae 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -30,12 +30,14 @@
   "Set the default staff size, where SZ is thought to be in PT."
   (let* ((old-mod (current-module))
         (pap (eval '$defaultpaper old-mod))
-
+        (is-paper? (module-defined? old-mod '$defaultpaper))
+       
 
         ;; Huh? Why is it necessary to clone object? 
         (new-paper (ly:output-def-clone pap))
         (new-scope (ly:output-def-scope new-paper)))
-    
+    (if (not is-paper?)
+       (ly:warn "Not in toplevel scope"))
     (set-current-module new-scope)
     (paper-set-staff-size (* sz (eval 'pt new-scope)))
     (set-current-module old-mod)