From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 18 Oct 1999 22:05:07 +0000 (+0200)
Subject: patch::: 1.2.15.jcn1
X-Git-Tag: release/1.2.16~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6dde377d70c7e7a6f35839d965915d9330a8b314;p=lilypond.git

patch::: 1.2.15.jcn1

pl 15.jcn1
	- bfs: initialise members of Column-x-positions and Break_node
	- bf: Documentation/misc: don't include backups
	- bf:  .gdbinit
---

diff --git a/CHANGES b/CHANGES
index 604f59c4aa..f37fcccf7b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+pl 15.jcn1
+	- bfs: initialise members of Column-x-positions and Break_node
+	- bf: Documentation/misc: don't include backups
+	- bf:  .gdbinit
+
 pl 15  (Oct 18)
 
 14.jcn1
diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile
index 55a1efe7ed..d9b79c0e6e 100644
--- a/Documentation/misc/GNUmakefile
+++ b/Documentation/misc/GNUmakefile
@@ -4,10 +4,9 @@ NAME = documentation
 
 STEPMAKE_TEMPLATES=documentation  texinfo
 
-TEXTS =AIMS $(wildcard CHANGES-*)  $(wildcard ANNOUNCE-*) $(wildcard NEWS-*) interview
+TEXTS =AIMS $(wildcard CHANGES-*[0-9])  $(wildcard ANNOUNCE-*[0-9]) $(wildcard NEWS-*[0-9]) interview
 EXTRA_DIST_FILES = $(TEXTS)
 
-
 include $(depth)/make/stepmake.make 
 
 default: do-doc
diff --git a/Documentation/misc/NEWS-1.2~ b/Documentation/misc/NEWS-1.2~
index d3499b3490..e69de29bb2 100644
--- a/Documentation/misc/NEWS-1.2~
+++ b/Documentation/misc/NEWS-1.2~
@@ -1,25 +0,0 @@
-WHAT'S NEW SINCE 1.0.17
-
-* Large cleanups, enhanced design and GUILE integration for smaller
-  memory footprint and more flexible code.
-
-* Direct output to PostScript (optional), PDFTeX or as GUILE script
-  (default output still to plain TeX).
-
-* Convertors for ABC and MUP formats.
-
-* Font: now available as scalable PostScript.  New glyphs: time
-  signature, more note heads.
-
-* Enhanced input: semi-automatic beaming, (nested) tuplets, (nested)
-  repeats, chordnames, automatic Lyrics durations.
-  
-* Grace notes, volta brackets, multiple styles for note heads and 
-  time signatures, breathing signs, lyric extenders, cross staff 
-  beaming and slurring.
-  
-* --safe option for the paranoid.
-
-* More elegant spacing.  Text is spaced exactly.
-
-* Lots of bugfixes.
diff --git a/TODO b/TODO
index dc34df7475..bd1b4f9110 100644
--- a/TODO
+++ b/TODO
@@ -12,6 +12,7 @@ Grep -i for TODO, FIXME and ugh/ugr/urg.
 . * use Rhythmic_head::position_i () for all Staff_referenced 
 . * .po -> .pot.
 . *  why need to run -C mf twice?
+. * fix interstaff stuff
 . * junk BLURB files.
 . * setting indent to 0 with \shape fails
 . * ly2dvi : don't repeat opus if same.
@@ -21,10 +22,6 @@ Grep -i for TODO, FIXME and ugh/ugr/urg.
 . * mudela-book doco
 . * rerun profile
 . * fix or replace feta-accordion.mf
-. * fix configure with CFLAGS or LDFLAGS, try:
-   CFLAGS=-g LDFLAGS='-Wl,--warn-common' ./configure
-configure will use them while testing the compiler, but they don't
-appear in config.make
 . * script engraver
 . * Chords:
 .  * Bass/inversion pitch when not part of Chord
diff --git a/VERSION b/VERSION
index a29c25c1b1..3bdc14f000 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=2
 PATCH_LEVEL=15
-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/buildscripts/set-lily.sh b/buildscripts/set-lily.sh
index d69f24b3b7..f809aba7d3 100755
--- a/buildscripts/set-lily.sh
+++ b/buildscripts/set-lily.sh
@@ -81,7 +81,7 @@ rm -f cmtfm; showln -sf $TEX_TFMDIR $BUILDDIR/cmtfm
 
 if [ -f ../.gdbinit.lilypond ];
 then
-    showln -f ../.gdbinit.lilypond .
+    showln -f ../.gdbinit.lilypond .gdbinit
 fi
 
 if [ -f ../.dstreamrc ]
diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc
index eb4c983701..2532610973 100644
--- a/lily/column-x-positions.cc
+++ b/lily/column-x-positions.cc
@@ -14,11 +14,11 @@ Column_x_positions::Column_x_positions()
 {
   energy_f_ = infinity_f;
   satisfies_constraints_b_ = false;
+  force_f_ = 0;
 }
 
 Column_x_positions::~Column_x_positions()
 {
-
 }
 
 
diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 63a6adc624..0e0ea46f4b 100644
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -40,6 +40,7 @@ struct Break_node {
   {
     prev_break_i_ = -1;
     line_i_ = 0;
+    demerits_f_ = 0;
   }
 };
 
@@ -56,10 +57,7 @@ Gourlay_breaking::do_solve () const
   optimal_paths.set_size (breaks.size ());
 
   Break_node first_node ;
-  first_node.prev_break_i_ = -1;
-  first_node.line_config_.force_f_ = 0;
   first_node.line_config_.energy_f_ = 0;  
-  first_node.line_i_ = 0;
   
   optimal_paths[0] = first_node; 
   int break_idx=1;
diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make
index 2ecf0bc232..7f820ab4e5 100644
--- a/stepmake/stepmake/metapost-rules.make
+++ b/stepmake/stepmake/metapost-rules.make
@@ -9,5 +9,5 @@ mfplain.mem: $(MFPLAIN_MP)
 $(outdir)/%.pfa: $(outdir)/%.0
 	$(PYTHON) $(depth)/buildscripts/ps-to-pfa.py --output $(basename $<).pfa $<
 	rm -f $(basename $(@F)).[0-9]*
-	rm -f $(basename $<).log $(basename $<).tfm
+	rm -f $(basename $<).log