From 24b601ff1489f119275d76632b501e7efeecfe78 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 6 Jun 2006 13:02:42 +0000 Subject: [PATCH] * Documentation/misc/GNUmakefile (TEXTS): use src-wildcard for disting MISC files. * lily/simple-spacer.cc (get_column_desc): desc -> description. --- ChangeLog | 9 +++++ Documentation/GNUmakefile | 2 +- Documentation/misc/GNUmakefile | 2 +- config.make.in | 1 - lily/simple-spacer.cc | 66 +++++++++++++++++----------------- 5 files changed, 44 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c9ec15857..1ed637dd1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-06-06 Han-Wen Nienhuys + + * Documentation/misc/GNUmakefile (TEXTS): use src-wildcard for + disting MISC files. + + * lily/simple-spacer.cc (get_column_desc): desc -> description. + 2006-06-06 Joe Neeman * lily/simple-spacer.cc (get_line_configuration): add @@ -11,6 +18,8 @@ 2006-06-06 Han-Wen Nienhuys + * config.make.in (METAFONT): remove MAKEINFO_VERSION + * stepmake/stepmake/topdocs-targets.make (make-txt-files): define make-txt-files target. diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 2b57b008f9..a56d00d9f2 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -1,7 +1,7 @@ depth = .. NAME = documentation -SUBDIRS=user bibliography pictures topdocs misc +SUBDIRS=user bibliography pictures topdocs misc STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"' diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile index 2e22c03997..4b68919774 100644 --- a/Documentation/misc/GNUmakefile +++ b/Documentation/misc/GNUmakefile @@ -4,7 +4,7 @@ NAME = documentation STEPMAKE_TEMPLATES=documentation texinfo -TEXTS = $(wildcard ANNOUNCE-*[0-9]) $(wildcard CHANGES-*[0-9]) $(wildcard ChangeLog*[0-9]) $(wildcard NEWS-*[0-9]) +TEXTS = $(call src-wildcard,ANNOUNCE-*[0-9]) $(call src-wildcard,CHANGES-*[0-9]) $(call src-wildcard ChangeLog*[0-9]) $(call src-wildcard NEWS-*[0-9]) EXTRA_DIST_FILES = $(TEXTS) include $(depth)/make/stepmake.make diff --git a/config.make.in b/config.make.in index 4bb0b6f80f..7a7c8d5aee 100644 --- a/config.make.in +++ b/config.make.in @@ -126,7 +126,6 @@ LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@ LN = @LN@ LN_S = @LN_S@ MAKEINFO_PROGRAM = @MAKEINFO@ -MAKEINFO_VERSION = @MAKEINFO_VERSION@ METAFONT = @METAFONT@ -progname=mf MFMODE = @MFMODE@ MFTRACE = @MFTRACE@ diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index fe10a90a5b..e027b5e26a 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -211,22 +211,22 @@ Simple_spacer::compress_line () void Simple_spacer::add_spring (Real ideal, Real inverse_hooke) { - Spring_description desc; + Spring_description description; - desc.ideal_ = ideal; - desc.inverse_hooke_ = inverse_hooke; - if (!desc.is_sane ()) + description.ideal_ = ideal; + description.inverse_hooke_ = inverse_hooke; + if (!description.is_sane ()) { programming_error ("insane spring found, setting to unit"); - desc.inverse_hooke_ = 1.0; - desc.ideal_ = 1.0; + description.inverse_hooke_ = 1.0; + description.ideal_ = 1.0; } - desc.block_force_ = -desc.ideal_ / desc.inverse_hooke_; + description.block_force_ = -description.ideal_ / description.inverse_hooke_; // block at distance 0 - springs_.push_back (desc); + springs_.push_back (description); } vector @@ -279,33 +279,33 @@ Spring_description::length (Real f) const this closely. */ -struct Rod_desc +struct Rod_description { vsize r_; Real dist_; - bool operator< (const Rod_desc r) + bool operator< (const Rod_description r) { return r_ < r.r_; } - Rod_desc () + Rod_description () { r_ = 0; dist_ = 0; } - Rod_desc (vsize r, Real d) + Rod_description (vsize r, Real d) { r_ = r; dist_ = d; } }; -struct Column_desc +struct Column_description { - vector rods_; - vector end_rods_; /* use these if they end at the last column of the line */ + vector rods_; + vector end_rods_; /* use these if they end at the last column of the line */ Real ideal_; Real inverse_hooke_; Real end_ideal_; @@ -313,7 +313,7 @@ struct Column_desc SCM break_permission_; Interval keep_inside_line_; - Column_desc () + Column_description () { ideal_ = 0; inverse_hooke_ = 0; @@ -386,20 +386,20 @@ get_column_spring (Grob *this_col, Grob *next_col, Real *ideal, Real *inv_hooke) *inv_hooke = (spring) ? spring->inverse_strength_ : 1.0; } -static Column_desc -get_column_desc (vector const &cols, vsize col_index, bool line_starter) +static Column_description +get_column_description (vector const &cols, vsize col_index, bool line_starter) { Grob *col = cols[col_index]; if (line_starter) col = maybe_find_prebroken_piece (col, RIGHT); - Column_desc desc; + Column_description description; Grob *next_col = next_spaceable_column (cols, col_index); if (next_col) - get_column_spring (col, next_col, &desc.ideal_, &desc.inverse_hooke_); + get_column_spring (col, next_col, &description.ideal_, &description.inverse_hooke_); Grob *end_col = next_line_ending_column (cols, col_index); if (end_col) - get_column_spring (col, end_col, &desc.end_ideal_, &desc.end_inverse_hooke_); + get_column_spring (col, end_col, &description.end_ideal_, &description.end_inverse_hooke_); for (SCM s = Spaceable_grob::get_minimum_distances (col); scm_is_pair (s); s = scm_cdr (s)) @@ -409,15 +409,15 @@ get_column_desc (vector const &cols, vsize col_index, bool line_starter) if (j != VPOS) { if (cols[j] == other) - desc.rods_.push_back (Rod_desc (j, scm_to_double (scm_cdar (s)))); + description.rods_.push_back (Rod_description (j, scm_to_double (scm_cdar (s)))); else /* it must end at the LEFT prebroken_piece */ - desc.end_rods_.push_back (Rod_desc (j, scm_to_double (scm_cdar (s)))); + description.end_rods_.push_back (Rod_description (j, scm_to_double (scm_cdar (s)))); } } if (!line_starter && to_boolean (col->get_property ("keep-inside-line"))) - desc.keep_inside_line_ = col->extent (col, X_AXIS); - desc.break_permission_ = col->get_property ("line-break-permission"); - return desc; + description.keep_inside_line_ = col->extent (col, X_AXIS); + description.break_permission_ = col->get_property ("line-break-permission"); + return description; } vector @@ -427,11 +427,11 @@ get_line_forces (vector const &icols, vector breaks, vector force; force.resize (breaks.size () * breaks.size (), infinity_f); - vector cols; + vector cols; vsize b = 1; SCM force_break = ly_symbol2scm ("force"); - cols.push_back (Column_desc ()); + cols.push_back (Column_description ()); for (vsize i = 1; i < icols.size () - 1; i++) { if (b < breaks.size () && breaks[b] == i) @@ -440,13 +440,13 @@ get_line_forces (vector const &icols, vector breaks, b++; } if (!is_loose (icols[i])) - cols.push_back (get_column_desc (icols, i, false)); + cols.push_back (get_column_description (icols, i, false)); } breaks.back () = cols.size () - 1; for (vsize b = 0; b < breaks.size () - 1; b++) { - cols[breaks[b]] = get_column_desc (icols, breaks[b], true); + cols[breaks[b]] = get_column_description (icols, breaks[b], true); vsize st = breaks[b]; for (vsize c = b+1; c < breaks.size (); c++) @@ -494,7 +494,7 @@ get_line_configuration (vectorconst &columns, Real indent, bool ragged) { - vector cols; + vector cols; Simple_spacer spacer; Column_x_positions ret; @@ -511,10 +511,10 @@ get_line_configuration (vectorconst &columns, cols.resize (ret.cols_.size () - 1); /* since we've already put our line-ending column in the column list, we can ignore - the end_XXX_ fields of our column_desc */ + the end_XXX_ fields of our column_description */ for (vsize i = 0; i < cols.size (); i++) { - cols[i] = get_column_desc (ret.cols_, i, i == 0); + cols[i] = get_column_description (ret.cols_, i, i == 0); spacer.add_spring (cols[i].ideal_, cols[i].inverse_hooke_); } for (vsize i = 0; i < cols.size (); i++) -- 2.39.2