patch::: 1.3.104.jcn1

1.3.104.jcn1
============

* Made some --scrdir build fixes.

diff --git a/CHANGES b/CHANGES
index 303cca1570867e1d4890b17a8fe9c4042ea4e521..89a2775ee0bbaf2957b7948c9591346c5a1c62a3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.104.jcn1
+============
+
+* Made some --scrdir build fixes.
+
 1.3.103.jcn5
 ============
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 0cee86ef33157df102a0821a31c016ffdfbc3cae..5a8db6f264e50b8d4e4d43f4b24c6ef095ffc2af 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -51,6 +51,10 @@ localclean:
 backdoc-WWW: $(outdir)/lilypond-internals.html
 
 #ugh. lily/OUT/lilypond hardcoded.
+# when cross-compiling, we don't have lilypond
 $(outdir)/lilypond-internals.texi:
-       (cd $(outdir); $(topdir)/lily/out/lilypond ../$(srcdir)/../ly/generate-documentation)
-
+       if [ -e $(depth)/$(builddir)/lily/out/lilypond ]; then \
+               cd $(outdir) && ../$(depth)/$(builddir)/lily/out/lilypond ../$(src-depth)/ly/generate-documentation; \
+       else \
+               touch $@; \
+       fi

diff --git a/VERSION b/VERSION
index 3e35f9dbd6adc8b03a1a1e748bcf8225399a26e2..b4d58e1246228719fa3c9ce10e7a658768039b06 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=104
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/make/generic-vars.make b/make/generic-vars.make
index 95d6e82f74cdb37de4435987cb08c48a9f36fdb0..3ad2d595d8399f0f38a1c7c8f324d5637f0edae1 100644 (file)
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -8,16 +8,21 @@
 # you do make dist 
 #
 
-buildscripts = $(depth)/buildscripts
 
+# using src-depth iso depth is only necessary for broken rules that do
+#     cd $(outdir) && foo $(depth) ...
+buildscript-dir = $(src-depth)/buildscripts
+script-dir = $(src-depth)/scripts
+input-dir = $(src-depth)/input
 
-flower-dir = $(depth)/flower
-lib-dir = $(depth)/lib
-lily-dir = $(depth)/lily
-mi2mu-dir = $(depth)/mi2mu
-make-dir = $(depth)/make
-include-lib = $(depth)/lib/include
-include-flower = $(depth)/flower/include
+
+flower-dir = $(src-depth)/flower
+lib-dir = $(src-depth)/lib
+lily-dir = $(src-depth)/lily
+mi2mu-dir = $(src-depth)/mi2mu
+make-dir = $(src-depth)/make
+include-lib = $(src-depth)/lib/include
+include-flower = $(src-depth)/flower/include
 
 
 

diff --git a/make/mudela-rules.make b/make/mudela-rules.make
index 9e0e47e6ceec563e73526d5a2c0cdcf9c125a9a9..28fd1893a7c0c742e62dbf890647d9e93fb1d2d7 100644 (file)
--- a/make/mudela-rules.make
+++ b/make/mudela-rules.make
@@ -5,17 +5,19 @@
 SUBST_TEXI_DEPS=sed 's! \.\./! !g' < $(basename $@).dep > $(outdir)/temp.dep ;         mv $(outdir)/temp.dep $(basename $@).dep 
 
 $(outdir)/%.latex: %.doc
-       cd $(outdir);LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ ../$< 
+       LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/mudela-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ $< 
        $(SUBST_TEXI_DEPS)
 
+# don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
+# it is not, for --scrdir builds
 $(outdir)/%.texi: %.tely
-       cd $(outdir); LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(depth)/../scripts/mudela-book.py -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi ../$<
+       LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/mudela-book.py --outdir=$(outdir) -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $<
        $(SUBST_TEXI_DEPS)
 
 # nexi: no-lily texi
 # for plain info doco: don't run lily
 $(outdir)/%.nexi: %.tely
-       cd $(outdir); LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(depth)/../scripts/mudela-book.py --no-lily -I .. -I $(depth)/../input/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi ../$<
+       LILYPONDPREFIX=$(LILYPONDPREFIX)/..  $(PYTHON) $(script-dir)/mudela-book.py --outdir=$(outdir) --no-lily -I .. -I $(input-dir)/test/ --dependencies --dep-prefix=$(outdir)/ --format=texi $<
        mv $(@D)/$(*F).texi $@
        $(SUBST_TEXI_DEPS)
 

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index b741023eaf75bdfc1bfb66e92aebb49b8a49768e..509de0118a58051facedd102d8f03a6a1bc733c2 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -1,12 +1,12 @@
 
 
 $(outdir)/%.gif: $(outdir)/%.ps
-       sh $(buildscripts)/ps-to-gifs.sh $<
+       sh $(buildscript-dir)/ps-to-gifs.sh $<
        -mv $(name-stem)-page*.gif $(outdir)/
        touch $@
 
 $(outdir)/%.png: $(outdir)/%.ps
-       sh $(buildscripts)/ps-to-pngs.sh $<
+       sh $(buildscript-dir)/ps-to-pngs.sh $<
        -mv $(name-stem)-page*.png $(outdir)/
        touch $@
 
@@ -21,10 +21,10 @@ $(outdir)/%.ly.txt: %.abc
        ln -f $< $@
 
 $(outdir)/%.ly: %.abc
-       $(PYTHON) $(depth)/scripts/abc2ly.py -o $@ $< 
+       $(PYTHON) $(script-dir)/abc2ly.py -o $@ $< 
 
 $(outdir)/%.dvi: $(outdir)/%.ly
-       $(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir)  $< 
+       $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)  $< 
        -mv $(basename $(<F))*.midi $(outdir)
 
 # don't junk intermediate .dvi files.  They're easier to view than
@@ -32,9 +32,9 @@ $(outdir)/%.dvi: $(outdir)/%.ly
 .PRECIOUS: $(outdir)/%.dvi
 
 $(outdir)/%.dvi: %.ly
-       $(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir)  $< 
+       $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)  $< 
        -mv $(basename $<)*.midi $(outdir)
 
 $(outdir)/%.dvi: %.fly
-       $(PYTHON) $(depth)/scripts/ly2dvi.py -o $(outdir)  $< 
+       $(PYTHON) $(script-dir)/ly2dvi.py -o $(outdir)  $< 
        -mv $(basename $<)*.midi $(outdir)

diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make
index 15a0e4cf7393d5389fd18919dd6e54b0c50009d0..a55109ab364bb65dbc837f12bc459bbdea526d12 100644 (file)
--- a/make/mutopia-targets.make
+++ b/make/mutopia-targets.make
@@ -3,7 +3,7 @@
 all: $(OUT_FILES)
 
 local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
-#      (cd $(outdir); $(PYTHON) ../$(buildscripts)/mutopia-index.py --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples))
+#      (cd $(outdir); $(PYTHON) ../$(buildscript-dir)/mutopia-index.py --prefix=../ --suffix=/$(outdir) $(html_subdirs) $(all_examples))
 #      $(footify) $(outdir)/index.html
 
 local-web:
@@ -13,4 +13,4 @@ convert-mudela: local-convert-mudela
        $(LOOP)
 
 local-convert-mudela:
-       $(PYTHON) $(depth)/scripts/convert-mudela.py -e *ly
+       $(PYTHON) $(script-dir)/convert-mudela.py -e *ly

diff --git a/make/toplevel.make.in b/make/toplevel.make.in
index b433213ffeadb23bd477c69140697fe2e72ded6c..db72f683ceb09af36113b52e71da415e1781e232 100644 (file)
--- a/make/toplevel.make.in
+++ b/make/toplevel.make.in
@@ -61,8 +61,8 @@ examples:
 # use recursive make like we do everywhere else; leads to bugs that you
 # make a specific fix for.
 
-       $(PYTHON) $(buildscripts)/mutopia-index.py -o short-examples.html input/
-       $(PYTHON) $(buildscripts)/mutopia-index.py -o long-examples.html mutopia/
+       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o short-examples.html input/
+       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o long-examples.html mutopia/
 #$(footify-all-command)
        $(footify) --index=./ `$(FIND) . -name '*.html' -print`
        tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz *-examples.html  `find input mutopia -type d -name 'out-www' -print`
@@ -78,5 +78,5 @@ ifeq ($(KPATHSEA),0)
 endif
 
 local-WWW-clean:
-       $(SHELL) $(depth)/buildscripts/clean-fonts.sh
+       $(SHELL) $(buildscript-dir)/clean-fonts.sh
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 220f84ef341f3bc7ad3f59c02e10a7d59e9e0db9..02c950bc3ef327c08a3ac063a92986190dbe6b71 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -18,7 +18,7 @@ XPM_FONTS = feta20 feta-nummer10 feta-braces20
 #CM_AFM_FILES = cmr10
 
 $(outdir)/cmr10.afm:
-       -$(BASH) $(buildscripts)/tfmtoafm.sh `kpsewhich cmr10.tfm`
+       -$(GUILE) $(buildscript-dir)/tfm2oafm.scm `kpsewhich cmr10.tfm`
        -mv $(@F) $@
 
 LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
@@ -56,7 +56,7 @@ export MFINPUTS:=.:$(MFINPUTS)
 default: $(ALL_GEN_FILES)
 
 $(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log
-       $(PYTHON) $(buildscripts)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
+       $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
 
 localclean:
        rm -f mfplain.mem mfplain.log mpout.log

diff --git a/scm/engraver-documentation-lib.scm b/scm/engraver-documentation-lib.scm
index bdf12cad61ccc545de30cdb29577f9ec8f538702..7c8442f3a6078df98bd2f2c1bbb9392a21c259fc 100644 (file)
--- a/scm/engraver-documentation-lib.scm
+++ b/scm/engraver-documentation-lib.scm
@@ -112,9 +112,11 @@
          name " can contain \n"
          (human-listify (map reffy (map context-name accepts)))))
      
-     "\n\nThis context is built from the following engravers\n"
-     (apply string-append 
-           (map document-engraver-by-name consists)))))
+     "\n\nThis context is built from the following engravers: "
+     (if no-copies
+        (human-listify (map reffy (map engraver-name consists)))
+        (apply string-append 
+               (map document-engraver-by-name consists))))))
 
 
 ;; First level Context description

diff --git a/scm/generate-documentation.scm b/scm/generate-documentation.scm
index d53207fabaa679bf720f6ca821aa7a32251eed7b..2971b956ec8e127917ee694d65a27e9ecd2f212a 100644 (file)
--- a/scm/generate-documentation.scm
+++ b/scm/generate-documentation.scm
@@ -20,6 +20,15 @@
 (eval-string (ly-gulp-file "engraver-documentation-lib.scm"))
 (eval-string (ly-gulp-file "backend-documentation-lib.scm"))
 
+
+
+;;(define no-copies #t)  ; from 490 to 410K, but doesn't look nice yet
+;;
+;; Also, copies of interfaces use up lots more space, but that's
+;; functional because the default property values of the interfaces
+;; are described...
+(define no-copes #f)
+
 (let* ((doc (string-append
            (document-paper "LilyPond interpretation contexts")
            (document-all-engravers "LilyPond engravers")

diff --git a/scm/translator-description.scm b/scm/translator-description.scm
index 6f8beaa2b1f782ccca7de6b3519e1bd420f36139..61badb5ef96434fc42661599cc7344a119d40c3d 100644 (file)
--- a/scm/translator-description.scm
+++ b/scm/translator-description.scm
@@ -459,6 +459,15 @@ If omitted, then dots appear on top of the notes.
       (translator-property-description 'keySignature list? "")
       )))
 
+   (cons 'Lyric_engraver
+        (engraver-description
+         "Lyric_engraver"
+         ""
+         '()
+         (list
+          ;; FIXME
+          )))
+
    (cons 'Lyric_phrasing_engraver
         (engraver-description
          "Lyric_phrasing_engraver"
@@ -677,6 +686,15 @@ Description of scripts to use.  (fixme)
       (translator-property-description 'currentCommandColumn ly-element? "")
       )))
    
+   (cons 'Skip_req_swallow_translator
+        (engraver-description
+         "Skip_req_swallow_translator"
+         ""
+         '()
+         (list
+          ;; FIXME
+          )))
+
    (cons
     'Slur_engraver
     (engraver-description

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index f165a99e9330a011583527a1a149861916674b7b..4bebe73e922919738688b6391d30f78f2693be8c 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -10,39 +10,42 @@
 # directory names:
 
 # depth from group-dir
-# not eh, normally used
+# internal, not normally used
 DEPTH = $(depth)/$(package-depth)
 
-# topdir := $(shell cd $(depth); pwd)
 ifeq ($(topdir),)
 topdir := $(shell cd $(depth); pwd)
 endif
 pwd := $(shell pwd)
 
+# $(depth) is deprecated, for most cases you'll want $(src-depth)
+#
+# Well, on second thought.
+# It can do no harm, but using src-depth iso depth is only necessary
+# for broken rules that do
+#    cd $(outdir) && foo  $(depth) ...
+src-depth = $(depth)/$(srcdir)
+
 # derived names
 ifeq ($(distdir),)
-#  distdir = $(depth)/$(outdir)/$(DIST_NAME)
-# must be absolute for 'make dist' with installed stepmake
   distdir = $(topdir)/$(outdir)/$(DIST_NAME)
   DIST_NAME = $(package)-$(TOPLEVEL_VERSION)
 endif
 distname = $(package)-$(TOPLEVEL_VERSION)
 
 # obsolete?
-makeout = $(depth)/make/$(outdir)
-docout = $(depth)/Documentation/$(outdir)
-binout = $(depth)/bin/$(outdir)
+#makeout = $(depth)/make/$(outdir)
+#docout = $(depth)/Documentation/$(outdir)
+#binout = $(depth)/bin/$(outdir)
 
-doc-dir = $(depth)/Documentation
-po-dir = $(depth)/po
+doc-dir = $(src-depth)/Documentation
+po-dir = $(src-depth)/po
 
 # sort-out which of these are still needed
 #
 $(package)_bindir = $(depth)/bin
 step-bindir = $(stepmake)/bin
-# deprecated
-# abs-step-bindir = $(topdir)/$(stepmake)/bin
-#
+
 group-dir = $(shell cd $(DEPTH)/..; pwd)
 release-dir = $(group-dir)/releases
 patch-dir = $(group-dir)/patches