patch::: 1.3.45.jcn1

1.3.45.jcn1
===========

* Accidentals with chord-names smaller and as superscript.

* Do some extra footify (works only once) while making html docs.
  When I do

     make out=www -C Documentation/out-www/regression-test.html

  I expect a footified and white-backgrounded .html.

diff --git a/CHANGES b/CHANGES
index 8749754c4b0a9d5824f84aa377790fc77344e2fc..4323a76f64faa2733dc60614f6c02d66a94de9b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+1.3.45.jcn1
+===========
+
+* Accidentals with chord-names smaller and as superscript.
+
+* Do some extra footify (works only once) while making html docs.  
+  When I do
+
+     make out=www -C Documentation/out-www/regression-test.html
+
+  I expect a footified and white-backgrounded .html.
+
 1.3.44.jcn2
 ===========
 
@@ -326,9 +338,9 @@ property is already set.
 
       # Use same configuration, but different output directory:
       #
-      #     make out=WWW
+      #     make out=www
       #
-      # uses config.make and config.h; output goes to out-WWW.
+      # uses config.make and config.h; output goes to out-www.
       #
 
 

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index f1b3fcddf276452ce187bc3c43efe3153323d1eb..7f4113cdef09077bf2a444aa84dbb1a4221621c4 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -13,6 +13,8 @@ include $(depth)/make/stepmake.make
 default: local-doc
 
 local-WWW: copy-for-me $(outdir)/regression-test.ps.gz $(outdir)/regression-test.html
+# we want footers even if website builds (or is built) partly
+       $(MAKE) footify
 
 copy-for-me:
        $(foreach a, $(README_TOP_FILES),cp ../$(a) $(outdir)/$(a).txt && ) true

diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile
index ca0c7ae4a4beeb41bec90cf85921cccb09351d81..bca6b910c87a5daaca1fcbef3a897d86d661fd90 100644 (file)
--- a/Documentation/bibliography/GNUmakefile
+++ b/Documentation/bibliography/GNUmakefile
@@ -29,11 +29,14 @@ local-WWW: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html))
 
 $(outdir)/%.bib: %.bib
        ln -f $< $@
+# we want footers even if website builds (or is built) partly
+       $(MAKE) footify
+
 
 # ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  
 $(outdir)/%.html: %.bib
        -bib2html $< $@
-#      $(footify) $@
+       $(footify) $@
 
 localclean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index f9ad1459d36657f5abd4b4b25c7516dc0db63c23..254c98a837a33378c6d767a9af19ca39be0dc91b 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -9,4 +9,6 @@ HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=
 include $(depth)/make/stepmake.make 
 
 local-WWW: $(HTML_FILES)
+# we want footers even if website builds (or is built) partly
+       $(MAKE) footify
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index ad61134692719361cf21c5378e07910fe584bea6..14857cc768111cc096d1bcca23197cdd71844ca3 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -32,10 +32,11 @@ local-WWW: $(HTML_FILES)   $(datafiles) $(PS_GZ_FILES)
        $(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation' \
           $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \
          | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-       $(footify) $(outdir)/index.html
 
 $(outdir)/%.bib: %.bib
        ln -f $< $@
+# we want footers even if website builds (or is built) partly
+       $(MAKE) footify
 
 localclean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 

diff --git a/VERSION b/VERSION
index 3330e8a8cd747c0f4f6c98c5d8895bc77d1814e0..6503af2527838dec39c11bc19c1849674f5e5f90 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=45
-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/lily/chord-name.cc b/lily/chord-name.cc
index 27e3342e51e7ecd34de67b75593a881206ad6083..3bd520d66a34ec7fec12ff2cdfef57d2f882be4a 100644 (file)
--- a/lily/chord-name.cc
+++ b/lily/chord-name.cc
@@ -78,9 +78,17 @@ Chord_name::pitch2molecule (Musical_pitch p) const
     We want the smaller size, even if we're big ourselves.
    */
   if (p.accidental_i_)
-    mol.add_at_edge (X_AXIS, RIGHT, 
+    {
+      Molecule acc = paper_l ()->lookup_l (-3)->afm_find
+       (String ("accidentals-") + to_str (p.accidental_i_));
+      // urg, howto get a good superscript_y?
+      Real super_y = lookup_l ()->text ("", "x", paper_l ()).extent
+       ()[Y_AXIS].length () / 2;
+      super_y += -acc.extent ()[Y_AXIS][MIN];
+      acc.translate_axis (super_y, Y_AXIS);
+      mol.add_at_edge (X_AXIS, RIGHT, acc, 0.0);
+    }
                     
-                    paper_l ()->lookup_l (-2)->afm_find (String ("accidentals-") + to_str (p.accidental_i_)), 0.0);
   return mol;
 }
 
@@ -282,7 +290,8 @@ Chord_name::do_brew_molecule () const
     }
 
   // urg, howto get a good superscript_y?
-  Real super_y = lookup_l ()->text ("", "x", paper_l ()).dim_.y ().length ()/2;
+  Real super_y = lookup_l ()->text ("", "x", paper_l ()).extent
+    ()[Y_AXIS].length () / 2;
   if (!name.addition_mol.empty_b ())
     name.addition_mol.translate (Offset (0, super_y));
 

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index 0a7bf172c2634d28f5bf6163f0fd657f4e9f9aa0..61d00a4e9601953bb21a3402d81585c6d8983ebb 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -270,6 +270,17 @@ Piano_pedal_engraver::do_pre_move_processing ()
       if (p.item_p_)
        {
          side_position (p.item_p_).add_staff_support ();
+         /*
+           Hmm.
+         */
+         if (i.key () != "Sustain")
+           {
+             if (Item* sustain = info_dict_["Sustain"].item_p_)
+               {
+                 Side_position_interface st (p.item_p_);
+                 st.add_support (sustain);
+               }
+           }
          typeset_element (p.item_p_);
        }
       p.item_p_ = 0;

diff --git a/ly/paper16.ly b/ly/paper16.ly
index be59707f540c543a2ab4fbac301ebbc534e7a890..9445759068165be904edbf892ebe4225bea741eb 100644 (file)
--- a/ly/paper16.ly
+++ b/ly/paper16.ly
@@ -26,10 +26,12 @@ paper_sixteen = \paper {
        0 = \font "feta16" 
        -1 = \font "feta13"
        -2 = \font "feta11"
+       -3 = \font "feta11"
        
-       "font_feta-2" = 11.;
-       "font_feta-1" = 13.;
        "font_feta" = 16.;
+       "font_feta-1" = 13.;
+       "font_feta-2" = 11.;
+       "font_feta-3" = 11.;
 
        \include "params.ly";
 }

diff --git a/ly/paper20.ly b/ly/paper20.ly
index 308bc86ca46d4d981da782583d684c921da3cb2a..aeb925a834eeac047cec522e532116499d9a5d9e 100644 (file)
--- a/ly/paper20.ly
+++ b/ly/paper20.ly
@@ -28,13 +28,15 @@ paper_twenty = \paper {
        quartwidth =  6.61\pt;
        wholewidth = 9.90\pt;
 
-       -2 = \font "feta13"
-       -1 = \font "feta16"
        0 = \font "feta20"
+       -1 = \font "feta16"
+       -2 = \font "feta13"
+       -3 = \font "feta11"
 
-       "font_feta-2" = 13.;
-       "font_feta-1" = 16.;
        "font_feta" = 20.;
+       "font_feta-1" = 16.;
+       "font_feta-2" = 13.;
+       "font_feta-3" = 11.;
 
        \include "params.ly";
 }

diff --git a/make/stepmake.make b/make/stepmake.make
index c43fd0ffd6bc0ba02a91c38e5f04516887651b1d..92ce216398ec3de92873319940397991d000b68d 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -21,9 +21,9 @@ endif
 
 # Use same configuration, but different output directory:
 #
-#     make out=WWW
+#     make out=www
 #
-# uses config.make and config.h; output goes to out-WWW.
+# uses config.make and config.h; output goes to out-www.
 #
 ifdef out
   outbase=out-$(out)

diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index 10df9e75caa80fd18608a4723695ff6c853509b2..3f9e26304e111c4887b46ad2c56732aabbb092bd 100644 (file)
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -223,6 +223,7 @@
    generic-timesig-properties
    generic-clef-properties
    generic-collision-properties
+   generic-sustain-pedal-properties
    generic-rest-collision-properties
    generic-volta-spanner-properties
 ;   generic-staff-symbol-properties

diff --git a/stepmake/make/stepmake.make b/stepmake/make/stepmake.make
index 1130415d69bdf696d5818568d5cb2ab3e835ffff..7b0f16fe8ccd1744abd5ebc954a5a1a4728bc15a 100644 (file)
--- a/stepmake/make/stepmake.make
+++ b/stepmake/make/stepmake.make
@@ -21,9 +21,9 @@ endif
 
 # Use same configuration, but different output directory:
 #
-#     make out=WWW
+#     make out=www
 #
-# uses config.make and config.h; output goes to out-WWW.
+# uses config.make and config.h; output goes to out-www.
 #
 ifdef out
   outbase=out-$(out)

diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
index 8172d03b0bad6693b009ef9da0fba3183f36ff17..ab527dba4da4c426029ea43a843ce2523d9c592d 100644 (file)
--- a/stepmake/stepmake/documentation-targets.make
+++ b/stepmake/stepmake/documentation-targets.make
@@ -2,7 +2,7 @@
 default:
 
 
-local-WWW: $(OUTHTML_FILES)
+local-WWW: $(OUTHTML_FILES) footify
 
 local-web:
        $(MAKE) CONFIGSUFFIX=www local-WWW

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 0e08464814e67296a404e959809661b67127f98a..9b118581e27d85f2ee8507d02f48291e6538402e 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -88,8 +88,12 @@ doc: local-doc
 local-doc:
 
 # Ugh.  C++ specific.
+# If you're not the maintainer, there's no tarball in $(outdir)!
+# Maybe, there is one in ../releases
 doc++:
-       (cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz)
+       (cd $(outdir); \
+               $(SHELL) ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz || \
+               $(SHELL) ../$(step-bindir)/tar-docxx.sh $(release-dir)/$(package)-$(TOPLEVEL_VERSION).tar.gz)
 
 
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 82e8e5b101ab1a12e7cbed6e1ab8c43b064fe76d..42474ba6fc9255b6837b07f1659f64edf53a9244 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -7,6 +7,8 @@ $(outdir)/%.info: $(outdir)/%.texi
 
 $(outdir)/%.html:      $(outdir)/%.texi
        -makeinfo --force --output=$@ --html --no-headers $< 
+# we want footers even if website builds (or is built) partly
+       $(footify) $@
 
 $(outdir)/%.dvi:       $(outdir)/%.texi
 # --clean only in >= 3.12s