patch::: 1.5.14.jcn2

1.5.14.jcn2

diff --git a/CHANGES b/CHANGES
index b9f9b350bff0ec463aefc34e3cdfebbf80746547..dc1a04968eb9b49735d30ff17396542482a5e27b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-1.5.14.jcn1
+1.5.14.jcn2
 ===========
 
+* Ugly hack in add-html-footer for disabling tutorial and refman links
+in sidebar.
+
 * Guile > 1.4 compilation fixes.
 
 * Website bugfix: mailto: (thanks David Boersma).

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

diff --git a/input/test/blank.ly b/input/test/blank.ly
new file mode 100644 (file)
index 0000000..b13f630
--- /dev/null
+++ b/input/test/blank.ly
@@ -0,0 +1,19 @@
+\header {
+  texidoc="Blank music paper with clefs"
+}
+\score {
+  \notes {
+    % \clef violin
+    \clef bass 
+    \repeat unfold 9 { c1 \break }
+  }
+  \paper {
+    \translator {
+      \ScoreContext
+      TimeSignature \override #'transparent = ##t
+      NoteHead \override #'transparent = ##t
+      defaultBarType = #""
+      \remove Bar_number_engraver
+    }
+  }
+}

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index dc30cf3e2c75c04b6fe31e156782e97986c93c95..de933b472dd8dcc95b938c2f315b727f15c796df 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -60,7 +60,7 @@ Figured_bass_engraver::process_music ()
     {
       figure_ = new Item (get_property ("BassFigure"));
       announce_grob (figure_, rest_req_); // todo
-      figure_->set_grob_property ("text" , gh_str02scm ("-"));
+      figure_->set_grob_property ("text" , ly_str02scm ("-"));
     }
   else if (figures_.size ())
     {

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index bd7061a3d08405ad0c43e5988ad77a1eaaa204ee..75d00c25f19ac02ccc9ccc6798ad95b2c2c17cd7 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -41,8 +41,8 @@ ly_input_p (SCM x)
   return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ;
 }
 
-static
-void start_input_smobs ()
+static void
+start_input_smobs ()
 {
   input_tag = scm_make_smob_type ("input", 0);
   scm_set_smob_mark (input_tag, mark_smob);
@@ -52,7 +52,7 @@ void start_input_smobs ()
 
   scm_c_define_gsubr ("ly-input-location?", 1, 0, 0,
                      (Scheme_function_unknown)ly_input_p);
- }
+}
 
 SCM
 make_input (Input ip)

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index da47dab1e557d8c4acf66c43dee4d09da850fcfb..409f9e427210f96a993bd8bc35475cfac65b69ad 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -151,8 +151,20 @@ else:
 def remove_self_ref (s):       
        self_url = abspath (os.getcwd () + '/' + f)
        #sys.stderr.write ('url0: %s\n' % self_url)
-       self_url = re.sub ('.*' + string.lower (package_name) + '[^/]*/',
+
+       # self_url = re.sub ('.*?' + string.lower (package_name) + '[^/]*/',
+       #                '', self_url)
+       # URG - this only works when source tree is unpacked in `src/' dir
+       # For some reason, .*? still eats away
+       #     /home/fred/usr/src/lilypond-1.5.14/Documentation/user/out-www/lilypond/
+       # instead of just
+       #
+       #     /home/fred/usr/src/lilypond-1.5.14/
+       #
+       #     Tutorial.html
+       self_url = re.sub ('.*?src/' + string.lower (package_name) + '[^/]*/',
                         '', self_url)
+
        #sys.stderr.write ('url1: %s\n' % self_url)
        
        #urg, ugly lily-specific toplevel index hack
@@ -226,7 +238,7 @@ def do_file (f):
        s = re.sub ('@WEBMASTER@', webmaster, s)
        s = re.sub ('@GCOS@', gcos, s)
        s = re.sub ('@LOCALTIME@', localtime, s)
-       s = re.sub ('@MAILADDRESS@', mail_address, s)
+       s = re.sub ('@MAIL_ADDRESS@', mail_address, s)
 
        m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
        while m: