the great dash-replace.

(lilypond_version_re_str): require
only numbers and dots in \version string.

87 files changed, 278 insertions, 257 deletions

diff --git a/ChangeLog b/ChangeLog
index 4fd6f43b93..4f9f62303f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* {ly,lily,scm}/*: use dashes in \paper and \layout variables
+
+	* python/convertrules.py (lilypond_version_re_str): require
+	only numbers and dots in \version string.
+
 2006-02-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/system-start-delimiter.cc (print): allow style = text too.
diff --git a/VERSION b/VERSION
index b82c8c0b58..585440a180 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=31
+PATCH_LEVEL=32
 MY_PATCH_LEVEL=
 
diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index bdab636b6f..9f1f5e769d 100644
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -51,9 +51,9 @@ Ambitus::print (SCM smob)
 
       if (pmin < pmax)
 	{
-	  Real linethickness = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"))
+	  Real linethickness = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
 	    * robust_scm2double (me->get_property ("thickness"), 1.0);
-	  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+	  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 	  Interval x_extent = 0.5 * linethickness * Interval (-1, 1);
 	  Interval y_extent = Interval (pmin, pmax);
 	  Box line_box (x_extent, y_extent);
diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index d4d95a3e8d..15da9771ce 100644
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -119,7 +119,7 @@ Arpeggio::brew_chord_bracket (SCM smob)
       heads.unite (iv + ss->relative_coordinate (common, Y_AXIS) - my_y);
     }
 
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
   Real dy = heads.length () + sp;
   Real x = 0.7;
diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 5a30a2c9a5..28acd4f68a 100644
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -45,7 +45,7 @@ Bar_line::compound_barline (Grob *me, std::string str, Real h,
   Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1);
   Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1);
 
-  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;
@@ -146,7 +146,7 @@ Bar_line::simple_barline (Grob *me,
 {
   Real blot
     = rounded
-    ? me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"))
+    ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"))
     : 0.0;
 
   return Lookup::round_filled_box (Box (Interval (0, w),
diff --git a/lily/beam.cc b/lily/beam.cc
index d91431a919..ce0f1aff2c 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -334,7 +334,7 @@ Beam::print (SCM grob)
   Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
 
   Stencil the_beam;
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   for (vsize i = 0; i <= stems.size (); i++)
     {
@@ -391,7 +391,7 @@ Beam::print (SCM grob)
       if (stem)
 	w += stem_width / 2;
 
-      Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+      Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
       Stencil whole = Lookup::beam (slope, w, thick, blot);
       Stencil gapped;
 
diff --git a/lily/book.cc b/lily/book.cc
index 58972afa7c..edfca69fcf 100644
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -98,7 +98,7 @@ Book::process (Output_def *default_paper,
     return 0;
   
   Paper_book *paper_book = new Paper_book ();
-  Real scale = scm_to_double (paper->c_variable ("outputscale"));
+  Real scale = scm_to_double (paper->c_variable ("output-scale"));
   Output_def *scaled_bookdef = scale_output_def (paper, scale);
 
   Object_key *key = new Lilypond_general_key (0, user_key_, 0);
diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index bfc5da52fb..438bbe4c14 100644
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -85,7 +85,7 @@ void
 Break_algorithm::set_pscore (Paper_score *s)
 {
   pscore_ = s;
-  linewidth_ = s->layout ()->get_dimension (ly_symbol2scm ("linewidth"));
+  linewidth_ = s->layout ()->get_dimension (ly_symbol2scm ("line-width"));
 }
 
 std::vector<Column_x_positions>
diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 6e342f4513..f39e748fb5 100644
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -49,7 +49,7 @@ Breathing_sign::divisio_minima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   /*
    * Draw a small vertical line through the uppermost (or, depending
@@ -80,7 +80,7 @@ Breathing_sign::divisio_maior (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   /*
    * Draw a vertical line that is vertically centered in the staff
@@ -118,7 +118,7 @@ Breathing_sign::divisio_maxima (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   // like a "|" type bar
   Interval xdim (0, thickness);
@@ -146,7 +146,7 @@ Breathing_sign::finalis (SCM smob)
   else
     staff_size = 0.0;
 
-  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   // like a "||" type bar
   Interval xdim (0, thickness);
diff --git a/lily/figured-bass-continuation.cc b/lily/figured-bass-continuation.cc
index 45cb543821..d6b6f2002b 100644
--- a/lily/figured-bass-continuation.cc
+++ b/lily/figured-bass-continuation.cc
@@ -51,7 +51,7 @@ Figured_bass_continuation::print (SCM grob)
   Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (grob));
 
   Real thick =
-    me->layout ()->get_dimension (ly_symbol2scm ("linethickness"))
+    me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
     * robust_scm2double (me->get_property ("thickness"), 1);
   
   Interval spanned;
diff --git a/lily/font-metric-scheme.cc b/lily/font-metric-scheme.cc
index b24a94c3db..bcb034174e 100644
--- a/lily/font-metric-scheme.cc
+++ b/lily/font-metric-scheme.cc
@@ -123,7 +123,7 @@ LY_DEFINE (ly_font_name, "ly:font-name",
 LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0,
 	   (SCM font),
 	   "Given the font metric @var{font}, return the "
-	   "magnification, relative to the current outputscale.")
+	   "magnification, relative to the current outputs-cale.")
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
@@ -133,7 +133,7 @@ LY_DEFINE (ly_font_magnification, "ly:font-magnification", 1, 0, 0,
 LY_DEFINE (ly_font_design_size, "ly:font-design-size", 1, 0, 0,
 	   (SCM font),
 	   "Given the font metric @var{font}, return the "
-	   "design size, relative to the current outputscale.")
+	   "design size, relative to the current output-scale.")
 {
   Font_metric *fm = unsmob_metrics (font);
   SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric");
diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 83f0006cb2..798d2435f9 100644
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -86,7 +86,7 @@ Gourlay_breaking::do_solve () const
   Break_node first_node;
   optimal_paths.push_back (first_node);
 
-  bool ragged_right = to_boolean (pscore_->layout ()->c_variable ("raggedright"));
+  bool ragged_right = to_boolean (pscore_->layout ()->c_variable ("ragged-right"));
   bool ragged_last = to_boolean (pscore_->layout ()->c_variable ("raggedlast"));
 
   Real worst_force = 0.0;
diff --git a/lily/grid-line-interface.cc b/lily/grid-line-interface.cc
index 36dd333124..49befddff8 100644
--- a/lily/grid-line-interface.cc
+++ b/lily/grid-line-interface.cc
@@ -38,7 +38,7 @@ Grid_line_interface::print (SCM smobbed_me)
       return SCM_EOL;
     }
 
-  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real thick = robust_scm2double (me->get_property ("thickness"), 1.0)
     * staffline;
 
@@ -55,7 +55,7 @@ Grid_line_interface::width (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real thick = robust_scm2double (me->get_property ("thickness"), 1.0)
     * staffline;
 
diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index e6850fba0b..e8fcfbef03 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -15,10 +15,10 @@
 
 #include "translator.icc"
 
-class New_instrument_name_engraver : public Engraver
+class Instrument_name_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS (New_instrument_name_engraver);
+  TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
 
 protected:
   Spanner *text_spanner_;
@@ -28,13 +28,13 @@ protected:
   void process_music ();
 };
 
-New_instrument_name_engraver::New_instrument_name_engraver ()
+Instrument_name_engraver::Instrument_name_engraver ()
 {
   text_spanner_ = 0;
 }
 
 void
-New_instrument_name_engraver::process_music ()
+Instrument_name_engraver::process_music ()
 {
   if (!text_spanner_)
     {
@@ -60,7 +60,7 @@ New_instrument_name_engraver::process_music ()
 }
 
 void
-New_instrument_name_engraver::acknowledge_axis_group (Grob_info info)
+Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 {
   if (text_spanner_ 
       && dynamic_cast<Spanner *> (info.grob ())
@@ -74,7 +74,7 @@ New_instrument_name_engraver::acknowledge_axis_group (Grob_info info)
 }
 
 void
-New_instrument_name_engraver::finalize ()
+Instrument_name_engraver::finalize ()
 {
   if (text_spanner_)
     {
@@ -85,9 +85,9 @@ New_instrument_name_engraver::finalize ()
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER (New_instrument_name_engraver, axis_group);
+ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
 
-ADD_TRANSLATOR (New_instrument_name_engraver,
+ADD_TRANSLATOR (Instrument_name_engraver,
 
 		/* doc */
 		"Creates a system start text for instrument or vocal names.",
diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index 051e1231cb..281296c506 100644
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -30,7 +30,7 @@ Lyric_extender::print (SCM smob)
     common = common->common_refpoint (right_text, X_AXIS);
 
   common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS);
-  Real sl = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real sl = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   extract_grob_set (me, "heads", heads);
 
diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 07a069f761..f37be20971 100644
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -47,7 +47,7 @@ Hyphen_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
 
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt;
   Real font_size_step = robust_scm2double (me->get_property ("font-size"), 0.0);
   Real h = robust_scm2double (me->get_property ("height"), 0.5)
diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 377c4aebfc..f6fafa1227 100644
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -301,7 +301,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
   Real thickness
     = robust_scm2double (ligature->get_property ("thickness"), 1.4);
   thickness
-    *= ligature->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+    *= ligature->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   Real head_width
     = Font_interface::get_default_font (ligature)->
diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index aeb0194a3b..a36f1b1723 100644
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -144,7 +144,7 @@ internal_brew_primitive (Grob *me)
     }
 
   Real blotdiameter
-    = (me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+    = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
 
   if (primitive & MLP_STEM)
     {
diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 9520ca3460..95f2d89569 100644
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -171,7 +171,7 @@ Multi_measure_rest::big_rest (Grob *me, Real width)
   Real hair_thick = robust_scm2double (me->get_property ("hair-thickness"), .1);
 
   Real ss = Staff_symbol_referencer::staff_space (me);
-  Real slt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real slt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real y = slt * thick_thick / 2 * ss;
   Real ythick = hair_thick * slt * ss;
   Box b (Interval (0.0, max (0.0, (width - 2 * ythick))), Interval (-y, y));
diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index b0ead00598..6c257fd092 100644
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -91,7 +91,7 @@ LY_DEFINE (ly_layout_def_p, "ly:layout-def?",
 
 LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale",
 	   1, 0, 0, (SCM bp),
-	   "Get outputscale for BP.")
+	   "Get output-scale for BP.")
 {
   Output_def *b = unsmob_output_def (bp);
   SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");
diff --git a/lily/output-def.cc b/lily/output-def.cc
index 99015153f9..d93ee5db31 100644
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -144,7 +144,7 @@ Output_def::set_variable (SCM sym, SCM val)
 Interval
 line_dimensions_int (Output_def *def, int n)
 {
-  Real lw = def->get_dimension (ly_symbol2scm ("linewidth"));
+  Real lw = def->get_dimension (ly_symbol2scm ("line-width"));
   Real ind = n ? 0.0 : def->get_dimension (ly_symbol2scm ("indent"));
   return Interval (ind, lw);
 }
diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 3f402cc13d..8a17064261 100644
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -15,7 +15,7 @@
 Real
 output_scale (Output_def *od)
 {
-  return scm_to_double (od->lookup_variable (ly_symbol2scm ("outputscale")));
+  return scm_to_double (od->lookup_variable (ly_symbol2scm ("output-scale")));
 }
 
 SCM
diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc
index 3cefb8f772..c188de3704 100644
--- a/lily/score-scheme.cc
+++ b/lily/score-scheme.cc
@@ -30,7 +30,7 @@ LY_DEFINE (ly_make_score, "ly:make-score",
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
 	   2, 1, 0, (SCM score, SCM layout, SCM key),
 	   "Run @var{score} through @var{layout}, an output definition, "
-	   "scaled to correct outputscale already, "
+	   "scaled to correct output-scale already, "
 	   "return a list of layout-lines. "
 	   "\nTake optional Object_key argument.")
 {
diff --git a/lily/score.cc b/lily/score.cc
index 9b525ddd23..c8fbf84056 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -107,7 +107,7 @@ default_rendering (SCM music, SCM outdef,
   /* ugh.  */
   if (bpd->c_variable ("is-paper") == SCM_BOOL_T)
     {
-      Real scale = scm_to_double (bpd->c_variable ("outputscale"));
+      Real scale = scm_to_double (bpd->c_variable ("output-scale"));
 
       Output_def *def = scale_output_def (unsmob_output_def (outdef), scale);
       Output_def *bdef = scale_output_def (bpd, scale);
@@ -164,7 +164,7 @@ Score::book_rendering (Output_def *layoutbook,
   Real scale = 1.0;
 
   if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T)
-    scale = scm_to_double (layoutbook->c_variable ("outputscale"));
+    scale = scm_to_double (layoutbook->c_variable ("output-scale"));
 
   SCM outputs = SCM_EOL;
   SCM *tail = &outputs;
diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 2980d3c5b8..5f978cc483 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -292,7 +292,7 @@ Slur_score_state::fill (Grob *me)
     }
 
   staff_space_ = Staff_symbol_referencer::staff_space (me);
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   thickness_ = robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
 
   dir_ = get_grob_direction (me);
diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index b866302a21..cfde343029 100644
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -70,7 +70,7 @@ Staff_symbol_referencer::line_thickness (Grob *me)
   Grob *st = get_staff_symbol (me);
   if (st)
     return Staff_symbol::get_line_thickness (st);
-  return me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  return me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 }
 
 Real
diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index aa9596bfdd..6edb1f910e 100644
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -35,7 +35,7 @@ Staff_symbol::print (SCM smob)
 
     --hwn.
   */
-  Real t = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   t *= robust_scm2double (me->get_property ("thickness"), 1.0);
 
   Direction d = LEFT;
@@ -125,7 +125,7 @@ Staff_symbol::staff_space (Grob *me)
 Real
 Staff_symbol::get_line_thickness (Grob *me)
 {
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   return robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
 }
@@ -144,7 +144,7 @@ SCM
 Staff_symbol::height  (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Real t = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   t *= robust_scm2double (me->get_property ("thickness"), 1.0);
   
   SCM line_positions = me->get_property ("line-positions");
diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 7c0e9e9680..f515f95908 100644
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -73,7 +73,7 @@ Stem_tremolo::raw_stencil (Grob *me)
   Real ss = Staff_symbol_referencer::staff_space (me);
   Real thick = robust_scm2double (me->get_property ("beam-thickness"), 1);
   Real width = robust_scm2double (me->get_property ("beam-width"), 1);
-  Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   width *= ss;
   thick *= ss;
diff --git a/lily/stem.cc b/lily/stem.cc
index 111eda0532..0f42976d32 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -702,7 +702,7 @@ Stem::print (SCM smob)
   // URG
   Real stem_width = thickness (me);
   Real blot
-    = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+    = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
 
   Box b = Box (Interval (-stem_width / 2, stem_width / 2),
 	       Interval (stem_y[DOWN] * half_space, stem_y[UP] * half_space));
@@ -723,7 +723,7 @@ Stem::get_translated_flag (Grob *me)
     {
       Direction d = get_grob_direction (me);
       Real blot
-	= me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+	= me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
       Real stem_width = thickness (me);
       Real half_space = Staff_symbol_referencer::staff_space (me) * 0.5;
       Real y2 = robust_scm2double (me->get_property ("stem-end-position"), 0.0);
diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 73b350976e..7b37557b34 100644
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -55,7 +55,7 @@ Stencil
 System_start_delimiter::line_bracket (Grob *me, Real height)
 {
   Real thick
-    = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"))
+    = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"))
     * robust_scm2double (me->get_property ("thickness"), 1);
   Real w = 0.8;
   
@@ -95,7 +95,7 @@ System_start_delimiter::text (Grob *me_grob, Real h)
 Stencil
 System_start_delimiter::simple_bar (Grob *me, Real h)
 {
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real w = lt * robust_scm2double (me->get_property ("thickness"), 1);
   return Lookup::round_filled_box (Box (Interval (0, w), Interval (-h / 2, h / 2)),
 				   lt);
diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 1c8abf7150..46078a6ad2 100644
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -163,7 +163,7 @@ Vaticana_ligature_engraver::align_heads (std::vector<Grob_info> primitives,
     = dynamic_cast<Item *> (primitives[0].grob ())->get_column ();
 
   Real join_thickness
-    = thickness * column->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+    = thickness * column->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   /*
    * Amount of extra space two put between some particular
diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 87c983dcb3..76e3162e41 100644
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -203,10 +203,10 @@ vaticana_brew_primitive (Grob *me)
   Real thickness = robust_scm2double (me->get_property ("thickness"), 1);
 
   Real line_thickness
-    = thickness * me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+    = thickness * me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   Real blotdiameter
-    = (me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+    = (me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")));
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
 
diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly
index 220f869f29..cbf08fc1ec 100644
--- a/ly/Welcome_to_LilyPond.ly
+++ b/ly/Welcome_to_LilyPond.ly
@@ -31,4 +31,4 @@ That's it.  For more information, visit http://lilypond.org .
 }
 
 
-\version "2.6.0"  % necessary for upgrading to future LilyPond versions.
+\version "2.7.32"  % necessary for upgrading to future LilyPond versions.
diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly
index f27288e148..15e73bd9a3 100644
--- a/ly/accordion-defs-init.ly
+++ b/ly/accordion-defs-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 % Symbols needed to print accordion music
 % 
 %  2' = T
diff --git a/ly/bagpipe.ly b/ly/bagpipe.ly
index 3d9c657d7b..1c8ccbe485 100755
--- a/ly/bagpipe.ly
+++ b/ly/bagpipe.ly
@@ -6,10 +6,10 @@
   Sven Axelsson, the Murray Pipes & Drums of Gothenburg
   (http://www.murrays.nu)
   
-  $Id: bagpipe.ly,v 1.9 2006/01/31 23:52:53 hanwen Exp $
+  $Id: bagpipe.ly,v 1.10 2006/02/06 01:13:58 hanwen Exp $
 %}
 
-\version "2.7.31"
+\version "2.7.32"
 
 % Notes of the scale of the Great Highland Bagpipe. Extra high notes for bombarde.
 % Flat notes used mainly in some modern music.
diff --git a/ly/catalan.ly b/ly/catalan.ly
index 18ce752658..945a718fef 100644
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -74,6 +74,6 @@ pitchnamesCatalan = #`(
 
 pitchnames = \pitchnamesCatalan
 
-\version "2.6.0"
+\version "2.7.32"
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 66713ae8b4..24c113ecd2 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 chordmodifiers = #default-chord-modifier-list
 
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index e7e2ded3d8..9eef5204b0 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 %% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index 6cb8b9464f..0af40d7261 100644
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -63,6 +63,6 @@ pitchnamesDeutsch = #`(
 
 pitchnames = \pitchnamesDeutsch
 
-\version "2.6.0"
+\version "2.7.32"
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly
index 07be83d784..68ed30d565 100644
--- a/ly/drumpitch-init.ly
+++ b/ly/drumpitch-init.ly
@@ -1,5 +1,5 @@
 
-\version "2.6.0"
+\version "2.7.32"
 
 drumPitchNames =
 #'((acousticbassdrum . acousticbassdrum)
diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly
index 439e6d184b..17b75898b0 100644
--- a/ly/dynamic-scripts-init.ly
+++ b/ly/dynamic-scripts-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 %
 % declare the standard dynamic identifiers.
diff --git a/ly/english.ly b/ly/english.ly
index 35292caf5f..b5423dcd93 100644
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -87,7 +87,7 @@ pitchnamesEnglish = #`(
 
 pitchnames = \pitchnamesEnglish
 
-\version "2.6.0"
+\version "2.7.32"
 
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index f60ff00515..a5b0b93fba 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.14"
+\version "2.7.32"
 
 \context {
   \name "Global"
@@ -35,7 +35,7 @@
   \consists "Rest_collision_engraver"
   \consists "Accidental_engraver"
   \consists "Piano_pedal_engraver"
-  \consists "New_instrument_name_engraver"
+  \consists "Instrument_name_engraver"
   \consists "String_number_engraver"
   \consists "Axis_group_engraver"
 
@@ -144,7 +144,7 @@ contained staves are not connected vertically."
   \consists "Staff_symbol_engraver"
   \consists "Pitch_squash_engraver"
   \consists "Time_signature_engraver"
-  \consists "New_instrument_name_engraver"
+  \consists "Instrument_name_engraver"
   \consists "Axis_group_engraver"
   
   \accepts "Voice"
@@ -284,7 +284,7 @@ contained staves are not connected vertically."
   \override VerticalAlignment #'self-alignment-Y = #0
 
   \consists "Vertical_align_engraver"
-  \consists "New_instrument_name_engraver"
+  \consists "Instrument_name_engraver"
   
   instrument = #'()
   instr = #'()
@@ -343,7 +343,7 @@ printing of a single line of lyrics.  "
   \consists "Extender_engraver"
   \consists "Hyphen_engraver"
   \consists "Stanza_number_engraver"
-  \consists "New_instrument_name_engraver"
+  \consists "Instrument_name_engraver"
   \consists "Skip_event_swallow_translator"
   \consists "Font_size_engraver"
   \consists "Hara_kiri_engraver"
diff --git a/ly/espanol.ly b/ly/espanol.ly
index 44e5befbee..7265b68834 100644
--- a/ly/espanol.ly
+++ b/ly/espanol.ly
@@ -58,6 +58,6 @@ pitchnamesEspanol = #`(
 
 pitchnames = \pitchnamesEspanol
 
-\version "2.6.0"
+\version "2.7.32"
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly
index 376d6a3f16..2458c5c1f2 100644
--- a/ly/generate-documentation.ly
+++ b/ly/generate-documentation.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 %
 % Running LilyPond on this file generates the documentation
diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly
index 4eff2d7dd1..bcef8602c2 100644
--- a/ly/generate-interface-doc-init.ly
+++ b/ly/generate-interface-doc-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 %
 % Running LilyPond on this file generates the short interface doc
diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index fbd299096c..c5d1263bcd 100644
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 
 startGraceMusic =  {
diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 63f70023c4..5b580ae510 100644
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.31"
+\version "2.7.32"
 
 %%%%%%%%
 %%%%%%%% shortcuts common for all styles of gregorian chant notation
diff --git a/ly/init.ly b/ly/init.ly
index 677f4347b6..fba222de43 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -7,7 +7,7 @@
 #(define-public midi-debug  #f)
 
 
-\version "2.6.0"
+\version "2.7.32"
 
 \include "declarations-init.ly"
 
diff --git a/ly/italiano.ly b/ly/italiano.ly
index 4dd4c809cd..51083a5f78 100644
--- a/ly/italiano.ly
+++ b/ly/italiano.ly
@@ -86,6 +86,6 @@ pitchnamesItaliano = #`(
 
 pitchnames = \pitchnamesItaliano
 
-\version "2.6.0"
+\version "2.7.32"
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/midi-init.ly b/ly/midi-init.ly
index dde5d3b4ed..875ed950e9 100644
--- a/ly/midi-init.ly
+++ b/ly/midi-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 \midi {
         \tempo 4=60
 	\include "performer-init.ly"
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index cf185485b6..fdccdab375 100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -1,6 +1,6 @@
 % -*-Scheme-*-
 
-\version "2.6.0"
+\version "2.7.32"
 
 %% need SRFI-1 filter 
 
@@ -391,7 +391,7 @@ Example:
    ;;
    ;; bind voice identifiers to the voices
    (map (lambda (voice-id voice)
-          (ly:parser-define! parser voice-id 
+          (ly:parser-define!! parser voice-id 
                              (make-music 'SequentialMusic 
                                'origin location
                                'elements voice)))
diff --git a/ly/nederlands.ly b/ly/nederlands.ly
index 93b2668743..57eac1dac9 100644
--- a/ly/nederlands.ly
+++ b/ly/nederlands.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 %{
  common dutch names for notes. es means flat, is means sharp
 
diff --git a/ly/norsk.ly b/ly/norsk.ly
index 676fb65f68..fa3dc0b54f 100644
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -105,6 +105,6 @@ pitchnamesNorsk = #`(
 
 pitchnames =\pitchnamesNorsk
 
-\version "2.6.0"
+\version "2.7.32"
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index c8116b55c1..a176c942e4 100644
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 \paper {
 
@@ -15,15 +15,15 @@
 
     %% This is weird; `everyone' uses LATIN1?  How does I select TeX
     %% input encoding in EMACS? -- jcn
-    %%%%inputencoding = #"TeX"
-    inputencoding = #"latin1"
-    printpagenumber = ##t
+    %%%%input-encoding = #"TeX"
+    input-encoding = #"latin1"
+    print-page-number = ##t
 
     %%
     %% 20pt staff, 5 pt = 1.75 mm
     %%
 
-    outputscale = #1.7573
+    output-scale = #1.7573
     
     #(define-public book-title (marked-up-title 'bookTitleMarkup))
     #(define-public score-title (marked-up-title 'scoreTitleMarkup))
@@ -49,32 +49,32 @@
     %% this dimension includes the extent of the
     %% staves themselves.
     %%
-    betweensystemspace = #(* 20 mm)
+    between-system-space = #(* 20 mm)
     
     
     %%
     %% fixed space between systems.
     %%
-    betweensystempadding = #(* 4 mm)
+    between-system-padding = #(* 4 mm)
 
-    aftertitlespace = 5 \mm
-    beforetitlespace = 10 \mm
-    betweentitlespace = 2 \mm
+    after-title-space = 5 \mm
+    before-title-space = 10 \mm
+    between-title-space = 2 \mm
 
 
     %%
     %% Small staves are aligned so they come out on the same place on
     %% across different pages.
     %%
-    pagetopspace = #(* 12 mm)
+    page-top-space = #(* 12 mm)
 
     
-    raggedbottom = ##f
+    ragged-bottom = ##f
 
     %%
     %% looks best for shorter scores.
     %%
-    raggedlastbottom= ##t
+    ragged-last-bottom= ##t
 
     #(define font-defaults
       '((font-encoding . fetaMusic)))
@@ -100,14 +100,13 @@
 
     \include "titling-init.ly"
 
+    top-margin = 5 \mm
+    bottom-margin = 6 \mm
+    heap-separation = 4 \mm
+    foot-separation = 4 \mm
+    right-margin = 10 \mm
 
-    topmargin = 5 \mm
-    bottommargin = 6 \mm
-    headsep = 4 \mm
-    footsep = 4 \mm
-    rightmargin = 10 \mm
-
-    leftmargin = ##f
-    firstpagenumber = #1
-    printfirstpagenumber =##f
+    left-margin = ##f
+    first-page-number = #1
+    print-first-page-number =##f
   }
diff --git a/ly/params-init.ly b/ly/params-init.ly
index 05d07bb533..d477cfd53e 100644
--- a/ly/params-init.ly
+++ b/ly/params-init.ly
@@ -1,2 +1,2 @@
-\version "2.6.0"
+\version "2.7.32"
 
diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index ee0872fb51..cc98b254be 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.6"
+\version "2.7.32"
 
 %%
 %% setup for Request->Element conversion. 
diff --git a/ly/portugues.ly b/ly/portugues.ly
index d04c36b2bb..f865fac8bd 100644
--- a/ly/portugues.ly
+++ b/ly/portugues.ly
@@ -86,6 +86,6 @@ pitchnamesPortuguese = #`(
 
 pitchnames = \pitchnamesPortuguese
 
-\version "2.6.0"
+\version "2.7.32"
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/property-init.ly b/ly/property-init.ly
index 7fe0219e47..2b956cc397 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.7.31"
+\version "2.7.32"
 
 stemUp = \override Stem  #'direction = #UP
 stemDown = \override Stem  #'direction = #DOWN 
diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly
index 7a600ea106..650388798e 100644
--- a/ly/scale-definitions-init.ly
+++ b/ly/scale-definitions-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 
 major = #`(
diff --git a/ly/script-init.ly b/ly/script-init.ly
index 09a0ce2b29..bd875f15d6 100644
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 
 % code char abbreviations
diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index d8a3390c77..e7bf8b66eb 100644
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
diff --git a/ly/suomi.ly b/ly/suomi.ly
index 34980c2205..ff283ddc0f 100644
--- a/ly/suomi.ly
+++ b/ly/suomi.ly
@@ -48,6 +48,6 @@ pitchnamesSuomi = #`(
 
 pitchnames = \pitchnamesSuomi
 
-\version "2.6.0"
+\version "2.7.32"
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/svenska.ly b/ly/svenska.ly
index 6a92b3a768..7db961ab28 100644
--- a/ly/svenska.ly
+++ b/ly/svenska.ly
@@ -42,6 +42,6 @@ pitchnamesSvenska = #`(
 )
 
 pitchnames = \pitchnamesSvenska
-\version "2.6.0"
+\version "2.7.32"
 
 #(ly:parser-set-note-names parser pitchnames)
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index 8867929903..aabbcf9da0 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.32"
 
 slashSeparator = \markup {
   \hcenter
@@ -70,7 +70,7 @@ scoreTitleMarkup = \markup { \column {
 
 #(define (first-page layout props arg)
   (if (= (chain-assoc-get 'page:page-number props -1) 
-         (ly:output-def-lookup layout 'firstpagenumber))   (interpret-markup layout props arg)
+         (ly:output-def-lookup layout 'first-page-number))   (interpret-markup layout props arg)
    empty-stencil))
 
 #(define (last-page layout props arg)
@@ -80,27 +80,27 @@ scoreTitleMarkup = \markup { \column {
 
 #(define (not-first-page layout props arg)
   (if (not (= (chain-assoc-get 'page:page-number props -1)
-              (ly:output-def-lookup layout 'firstpagenumber)))
+              (ly:output-def-lookup layout 'first-page-number)))
    (interpret-markup layout props arg)
    empty-stencil))
 
 %% unused
 #(define (not-single-page layout props arg)
   (if (not (and (= (chain-assoc-get 'page:page-number props -1) 
-                   (ly:output-def-lookup layout 'firstpagenumber))
+                   (ly:output-def-lookup layout 'first-page-number))
                (chain-assoc-get 'page:last? props -1)))
    (interpret-markup layout props arg)
    empty-stencil))
 
 #(define (print-page-number layout props arg)
-  (if (eq? (ly:output-def-lookup layout 'printpagenumber) #t)
+  (if (eq? (ly:output-def-lookup layout 'print-page-number) #t)
    (interpret-markup layout props arg)
    empty-stencil))
 
 #(define (print-page-number-check-first layout props arg)
   (if (or (not (= (chain-assoc-get 'page:page-number props -1) 
-                  (ly:output-def-lookup layout 'firstpagenumber)))
-          (eq? (ly:output-def-lookup layout 'printfirstpagenumber) #t))
+                  (ly:output-def-lookup layout 'first-page-number)))
+          (eq? (ly:output-def-lookup layout 'printfirst-page-number) #t))
    (print-page-number layout props arg)
    empty-stencil))
 
diff --git a/ly/vlaams.ly b/ly/vlaams.ly
index 46302dd835..b2f5518f95 100644
--- a/ly/vlaams.ly
+++ b/ly/vlaams.ly
@@ -1,4 +1,4 @@
-\version "2.6.0" %hier stond 2.1.36, mocht ik dat wel veranderen?
+\version "2.7.32" %hier stond 2.1.36, mocht ik dat wel veranderen?
 
 %{
 
diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 9672572c99..7243731913 100644
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -19,11 +19,11 @@
 /init-paper {
 	gsave
 	clippath pathbbox newpath
-	/vsize exch def
-	/hsize exch def pop pop pop
+	/paper-height exch def
+	/paper-width exch def pop pop pop
 	% FIXME
 	/top-margin 2 def
-	hsize line-width sub 2 div /left-margin exch def
+	paper-width line-width sub 2 div /left-margin exch def
 	grestore
 } bind def
 
diff --git a/python/convertrules.py b/python/convertrules.py
index 9970696780..f35a782ed9 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -17,7 +17,7 @@ class FatalConversionError:
 conversions = []
 
 error_file = sys.stderr 
-lilypond_version_re_str = '\\\\version *\"([^"]+)\"'
+lilypond_version_re_str = '\\\\version *\"[0-9.]+"'
 lilypond_version_re = re.compile (lilypond_version_re_str)
 
 
@@ -2696,7 +2696,13 @@ def conv (str):
 		
 	str = re.sub (r'([A-Z][a-z_0-9]+::[a-z_0-9]+)',
 		      sub_cxx_id, str)
+	return str
+
+conversions.append (((2, 7, 31), conv,
+		     """Foo_bar::bla_bla -> ly:foo-bar::bla-bla"""))
+
 
+def conv (str):
 	identifier_subs = [
 		('inputencoding', 'input-encoding'),
 		('printpagenumber', 'print-page-number'),
@@ -2716,8 +2722,8 @@ def conv (str):
 		('footsep', 'foot-separation'),
 		('rightmargin', 'right-margin'),
 		('leftmargin', 'left-margin'),
-		('firstpagenumber', 'first-page-number'),
 		('printfirstpagenumber', 'print-first-page-number'),
+		('firstpagenumber', 'first-page-number'),
 		('hsize', 'paper-width'),
 		('vsize', 'paper-height'),
 		('horizontalshift', 'horizontal-shift'),
@@ -2729,8 +2735,12 @@ def conv (str):
 		('linewidth', 'line-width')
 		]
 	
+	for (a,b)  in identifier_subs:
+		### for C++:
+		## str = re.sub ('"%s"' % a, '"%s"' b, str)
+		
+		str = re.sub (a, b, str)
 	return str
 
-conversions.append (((2, 7, 31), conv,
-		     """Foo_bar::bla_bla -> ly:foo-bar::bla-bla"""))
-
+conversions.append (((2, 7, 32), conv,
+		     """foobar -> foo-bar for \paper, \layout"""))
diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 8c678c4087..ce5088eb8f 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -122,7 +122,7 @@ list of @code{BassFigureEvent}s, a context, and the grob to format.")
 
 
      (middleCPosition ,number? "Place of the middle C, measured in half
-staffspaces.  Usually determined by looking at @code{clefPosition} and
+staff-spaces.  Usually determined by looking at @code{clefPosition} and
 @code{clefGlyph}.")
 
      (chordNameFunction ,procedure?
@@ -430,7 +430,7 @@ for repeated bass figures")
 
      (verticalExtent ,number-pair? "Hard coded vertical extent.  The format
 is a pair of dimensions, for example, this sets the sizes of a staff
-to 10 (5+5) staffspaces high.
+to 10 (5+5) staff-spaces high.
 
 @example
 \\set Staff.verticalExtent = #'(-5.0 . 5.0)
diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 898e220d69..baa3b70d7a 100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -14,6 +14,13 @@
    "An accidental, printed as a suggestion (typically: vertically over a note)"
    '())
 
+
+(ly:add-interface
+ 'bass-figure-interface
+ "A bass figure text"
+ '(implicit))
+
+
 (ly:add-interface
  'dynamic-interface
    "Any kind of loudness sign"
@@ -108,9 +115,9 @@ are interesting enough to maintain a hara-kiri staff."
  '())
 
 (ly:add-interface
- 'bass-figure-interface
- "A bass figure text"
- '(implicit))
+ 'system-start-text-interface
+ "A text at the beginning of a system."
+ '(text long-text collapse-height style))
 
 ;;; todo: this is not typesetting info. Move to interpretation.
 (ly:add-interface
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 1c0396967d..4233361c26 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -64,7 +64,7 @@ Choices include @code{curved} and @code{straight}.")
 			     "Spacing is based on the shortest notes in a piece. Normally, pieces are spaced as if notes at least as short as this are present.")
      (baseline-skip ,ly:dimension? "Distance between base lines of
  multiple lines of text.")
-     (beam-thickness ,ly:dimension? "thickness, measured in staffspace.")
+     (beam-thickness ,ly:dimension? "thickness, measured in staff-space.")
      (beam-width ,ly:dimension? "width of the tremolo sign.")
      (beamed-stem-shorten ,list? "How much to shorten beamed stems,
 when their direction is forced. It is a list, since the value is different
@@ -231,7 +231,7 @@ of the @code{spacing-increment}.")
 
      (grow-direction ,ly:dir? "Crescendo or decrescendo?")
      (hair-thickness ,number? "Thickness of the thin line in a bar line.")
-     (height ,ly:dimension? "Height of an object in staffspace.")
+     (height ,ly:dimension? "Height of an object in staff-space.")
      (height-limit ,ly:dimension? "Maximum slur height: the longer the
 slur, the closer it is to this height.")
 
@@ -386,7 +386,7 @@ duration. Typically, the width of a note head. See also
      (springs-and-rods ,boolean? "Dummy variable for triggering spacing routines.")
      (stacking-dir ,ly:dir? "Stack objects in which direction?")
      (staff-space ,ly:dimension? "Amount of space between staff lines,
-expressed in global staffspace.")
+expressed in global staff-space.")
      (staff-position ,number? "Vertical position, measured in half
 staff spaces, counted from the middle line.")
      
@@ -416,9 +416,9 @@ this property.")
 words. The default RIGHT is for roman text. Arabic or hebrew should
 use LEFT.")
      (thick-thickness ,number? "Bar line thickness, measured in
-@code{linethickness}.")
+@code{line-thickness}.")
      (thickness ,number? "Bar line thickness, measured in
-@code{linethickness}.")
+@code{line-thickness}.")
      (thin-kern ,number? "The space after a hair-line in a bar line.")
 
      (threshold ,number-pair? "(@var{min} . @var{max}), where
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 4ba3869e69..df1dd3d9a9 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -5,8 +5,8 @@
 ;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
-;;;; distances are given in linethickness (thicknesses) and
-;;;; staffspace (distances)
+;;;; distances are given in line-thickness (thicknesses) and
+;;;; staff-space (distances)
 
 ;;;; WARNING: the meta field should be the last one.
 ;;;; WARNING: don't use anonymous functions for initialization.
@@ -174,7 +174,7 @@
 	;; Ross. page 151 lists other values, we opt for a leaner look
 	;;
 	;; TODO:
-	;; kern should scale with linethickness too.
+	;; kern should scale with line-thickness too.
 	(kern . 3.0)
 	(thin-kern . 3.0)
 	(hair-thickness . 1.9)
@@ -287,7 +287,7 @@
 
 	;; Whe have some unreferenced problems here.
 	;;
-	;; If we shorten beamed stems less than normal stems (1 staffspace),
+	;; If we shorten beamed stems less than normal stems (1 staff-space),
 	;; or high order less than 8th beams, patterns like
 	;;     c''4 [c''8 c''] c''4 [c''16 c]
 	;; are ugly (different stem lengths).
@@ -879,7 +879,7 @@
 
 	(stencil . ,ly:lyric-extender::print)
 
-	(thickness . 0.8) ; linethickness
+	(thickness . 0.8) ; line-thickness
 	(minimum-length . 1.5)
 	(Y-extent . (0 . 0))
 	(meta . ((class . Spanner)
@@ -1899,8 +1899,8 @@
 	(font-encoding . fetaNumber)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
-	(thickness . 1.6)  ;;  linethickness
-	(edge-height . (2.0 . 2.0)) ;; staffspace;
+	(thickness . 1.6)  ;;  line-thickness
+	(edge-height . (2.0 . 2.0)) ;; staff-space;
 	(minimum-space . 5)
 	(font-size . -4)
 	(meta . ((class . Spanner)
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 7eb2dff7cb..9f6ff63259 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -87,7 +87,7 @@ the PDF backend."
 		    width (+ (* width slope)  (/ thickness -2))
 		    width (+ (* width slope)  (/ thickness 2))
 		    0 (/ thickness 2))
-	       ,(ly:output-def-lookup layout 'blotdiameter)
+	       ,(ly:output-def-lookup layout 'blot-diameter)
 	       #t)
      (cons 0 width)
      (cons (+ (- half) (car yext))
@@ -319,7 +319,7 @@ gsave /ecrm10 findfont
 	 (text-dir (chain-assoc-get 'text-direction props RIGHT))
 	 (word-count (length stencils))
 	 (word-space (chain-assoc-get 'word-space props))
-	 (line-width (chain-assoc-get 'linewidth props))
+	 (line-width (chain-assoc-get 'line-width props))
 	 (fill-space
 	 	(cond
 			((= word-count 1) 
@@ -452,7 +452,7 @@ determines the space between each markup in @var{args}."
 (define (wordwrap-markups layout props args justify)
   (let*
       ((baseline-skip (chain-assoc-get 'baseline-skip props))
-       (line-width (chain-assoc-get 'linewidth props))
+       (line-width (chain-assoc-get 'line-width props))
        (word-space (chain-assoc-get 'word-space props))
        (text-dir (chain-assoc-get 'text-direction props RIGHT)) 
        (lines (wordwrap-stencils
@@ -466,21 +466,21 @@ determines the space between each markup in @var{args}."
 
 (def-markup-command (justify layout props args) (markup-list?)
   "Like wordwrap, but with lines stretched to justify the margins.
-Use @code{\\override #'(linewidth . X)} to set linewidth, where X
+Use @code{\\override #'(line-width . X)} to set line-width, where X
 is the number of staff spaces."
 
   (wordwrap-markups layout props args #t))
 
 (def-markup-command (wordwrap layout props args) (markup-list?)
-  "Simple wordwrap.  Use @code{\\override #'(linewidth . X)} to set
-linewidth, where X is the number of staff spaces."
+  "Simple wordwrap.  Use @code{\\override #'(line-width . X)} to set
+line-width, where X is the number of staff spaces."
 
   (wordwrap-markups layout props args #f))
 
 (define (wordwrap-string layout props justify arg) 
   (let*
       ((baseline-skip (chain-assoc-get 'baseline-skip props))
-       (line-width (chain-assoc-get 'linewidth props))
+       (line-width (chain-assoc-get 'line-width props))
        (word-space (chain-assoc-get 'word-space props))
        
        (para-strings (regexp-split
diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index 3e1b7492a4..7243ccebbc 100644
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -111,12 +111,12 @@
 
 (define (gnome-main book name)
   (let* ((paper (ly:paper-book-paper book))
-	 (hsize (ly:output-def-lookup paper 'hsize))
-	 (vsize (ly:output-def-lookup paper 'vsize))
-	 (page-width (inexact->exact (ceiling (* OUTPUT-SCALE hsize))))
-	 (page-height (inexact->exact (ceiling (* OUTPUT-SCALE vsize))))
-	 ;;(page-width (inexact->exact (ceiling hsize)))
-	 ;;(page-height (inexact->exact (ceiling vsize)))
+	 (paper-width (ly:output-def-lookup paper 'paper-width))
+	 (paper-height (ly:output-def-lookup paper 'paper-height))
+	 (page-width (inexact->exact (ceiling (* OUTPUT-SCALE paper-width))))
+	 (page-height (inexact->exact (ceiling (* OUTPUT-SCALE paper-height))))
+	 ;;(page-width (inexact->exact (ceiling paper-width)))
+	 ;;(page-height (inexact->exact (ceiling paper-height)))
 
 	 (screen-width (gdk-screen-width))
 	 (screen-height (gdk-screen-height))
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 36deeee731..1a89ea0e7e 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -63,7 +63,7 @@
 	   (plain (ps-font-command font))
 	   (designsize (ly:font-design-size font))
 	   (magnification (* (ly:font-magnification font)))
-	   (ops (ly:output-def-lookup paper 'outputscale))
+	   (ops (ly:output-def-lookup paper 'output-scale))
 	   (scaling (* ops magnification designsize)))
 
       ;; Bluesky pfbs have UPCASE names (sigh.)
@@ -99,15 +99,15 @@
    "/lily-output-units "
      (number->string mm-to-bigpoint)
      " def %% millimeter\n"
-   (output-entry "staff-line-thickness" 'linethickness)
-   (output-entry "line-width" 'linewidth)
+   (output-entry "staff-line-thickness" 'line-thickness)
+   (output-entry "line-width" 'line-width)
    (output-entry "paper-size" 'papersizename)
-   (output-entry "staff-height" 'staffheight)	;junkme.
+   (output-entry "staff-height" 'staff-height)	;junkme.
    "/output-scale "
-     (number->string (ly:output-def-lookup layout 'outputscale))
+     (number->string (ly:output-def-lookup layout 'output-scale))
      " def\n"
-   (output-entry "page-height" 'vsize)
-   (output-entry "page-width" 'hsize)))
+   (output-entry "page-height" 'paper-height)
+   (output-entry "page-width" 'paper-width)))
 
 (define (dump-page outputter page page-number page-count landscape?)
   (ly:outputter-dump-string
@@ -122,7 +122,7 @@
 	"")
     "%%EndPageSetup\n"
 
-    "gsave 0 vsize translate "
+    "gsave 0 paper-height translate "
     "set-ps-scale-to-lily-scale "
     "\n"))
   (ly:outputter-dump-stencil outputter page)
@@ -429,7 +429,7 @@
 	 (page-stencils (map page-stencil (ly:paper-book-pages book)))
 	 
 	 (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
-	 (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
+	 (page-number (1- (ly:output-def-lookup paper 'first-page-number)))
 	 (page-count (length page-stencils))
 	 (port (ly:outputter-port outputter)))
 
@@ -456,7 +456,7 @@
 
 (define-public (dump-stencil-as-EPS paper dump-me filename load-fonts?)
   (define (mm-to-bp-box mmbox)
-    (let* ((scale (ly:output-def-lookup paper 'outputscale))
+    (let* ((scale (ly:output-def-lookup paper 'output-scale))
 	   (box (map
 		 (lambda (x)
 		   (inexact->exact
@@ -508,7 +508,7 @@
 (define-public (output-preview-framework basename book scopes fields)
   (let* ((paper (ly:paper-book-paper book))
 	 (systems (ly:paper-book-systems book))
-	 (scale (ly:output-def-lookup paper 'outputscale))
+	 (scale (ly:output-def-lookup paper 'output-scale))
 	 (to-dump-systems '()))
 
     ;; skip booktitles.
@@ -544,7 +544,7 @@
 
       (let* ((paper (ly:paper-book-paper book))
 	     (systems (ly:paper-book-systems book))
-	     (scale (ly:output-def-lookup paper 'outputscale))
+	     (scale (ly:output-def-lookup paper 'output-scale))
 	     (titles (take-while paper-system-title? systems))
 	     (non-title (find (lambda (x)
 				(not (paper-system-title? x))) systems))
diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index 0eca19e39a..2e40558e64 100644
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -23,17 +23,17 @@
 					      (ly:output-backend)))
 	 (dump (lambda (str) (display str (ly:outputter-port outputter))))
    	 (paper (ly:paper-book-paper book))
-	 (unit-length (ly:output-def-lookup paper 'outputscale))
+	 (unit-length (ly:output-def-lookup paper 'output-scale))
 	 (output-scale (* lily-unit->mm-factor
 			  unit-length))
 	 (page-stencils (map page-stencil (ly:paper-book-pages book)))
 	 (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
-	 (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))
+	 (page-number (1- (ly:output-def-lookup paper 'first-page-number)))
 	 (page-count (length page-stencils))
-	 (hsize (ly:output-def-lookup paper 'hsize))
-	 (vsize (ly:output-def-lookup paper 'vsize))
-	 (page-width (inexact->exact (ceiling (* output-scale hsize))))
-	 (page-height (inexact->exact (ceiling (* output-scale vsize))))
+	 (paper-width (ly:output-def-lookup paper 'paper-width))
+	 (paper-height (ly:output-def-lookup paper 'paper-height))
+	 (page-width (inexact->exact (ceiling (* output-scale paper-width))))
+	 (page-height (inexact->exact (ceiling (* output-scale paper-height))))
 	 (page-set? (or (> page-count 1) landscape?)))
 
     (ly:outputter-output-scheme outputter
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 59ed71e53e..27e7d66013 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -91,7 +91,7 @@
 			(inexact->exact
 			 (round (* 1000
 				   (ly:font-magnification font)
-				   (ly:paper-outputscale paper)))))))
+				   (ly:paper-output-scale paper)))))))
 	     sub-fonts)))))
 
 (define (simple-font-load-command paper font)
@@ -102,7 +102,7 @@
     (inexact->exact
      (round (* 1000
 	       (ly:font-magnification font)
-	       (ly:paper-outputscale paper))))))
+	       (ly:paper-output-scale paper))))))
 
 (define (font-load-command paper font)
   (if (pair? (ly:font-sub-fonts font))
@@ -113,14 +113,14 @@
   (string-append
    ;; UGH. FIXME.
    "\\def\\lilypondpaperunit{mm}%\n"
-   (tex-number-def "lilypondpaper" 'outputscale
+   (tex-number-def "lilypondpaper" 'output-scale
 		   (number->string (exact->inexact
-				    (ly:paper-outputscale paper))))
+				    (ly:paper-output-scale paper))))
    (tex-string-def "lilypondpaper" 'papersize
 		   (eval 'papersizename (ly:output-def-scope paper)))
    ;; paper/layout?
-   (tex-string-def "lilypondpaper" 'inputencoding
-		   (eval 'inputencoding (ly:output-def-scope paper)))
+   (tex-string-def "lilypondpaper" 'input-encoding
+		   (eval 'input-encoding (ly:output-def-scope paper)))
 
    (apply string-append
 	  (map (lambda (x) (font-load-command paper x))
@@ -133,7 +133,7 @@
 		     "{" (sanitize-tex-string str) "}%\n")))
 
 (define (header paper page-count classic?)
-  (let ((scale (ly:output-def-lookup paper 'outputscale))
+  (let ((scale (ly:output-def-lookup paper 'output-scale))
 	(texpaper (string-append
 		   (ly:output-def-lookup paper 'papersizename)
 		   "paper"))
@@ -151,8 +151,8 @@
 	 "")
 
      (tex-string-def
-      "lilypondpaper" 'linewidth
-      (ly:number->string (* scale (ly:output-def-lookup paper 'linewidth))))
+      "lilypondpaper" 'line-width
+      (ly:number->string (* scale (ly:output-def-lookup paper 'line-width))))
      "\\def\\lilyponddocumentclassoptions{"
      (sanitize-tex-string texpaper)
      (if landscape? ",landscape" "")
diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index a52d0be47a..d7431d6170 100644
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -347,7 +347,7 @@ indications per string.
          (default-dot-position (if (eq? finger-code 'in-dot) (- 0.95 default-dot-radius) 0.6))  ; move up to make room for bigger if labeled
          (dot-radius (chain-assoc-get 'dot-radius props default-dot-radius))  ; needed for both draw-dots and draw-barre
          (dot-position (chain-assoc-get 'dot-position props default-dot-position)) ; needed for both draw-dots and draw-barre
-         (th (* (ly:output-def-lookup layout 'linethickness)
+         (th (* (ly:output-def-lookup layout 'line-thickness)
                 (chain-assoc-get 'thickness props 0.5))) ; needed for both draw-frets and draw-strings
                 
          (alignment (chain-assoc-get 'align-dir props -0.4)) ; needed only here
diff --git a/scm/layout-beam.scm b/scm/layout-beam.scm
index a5a81ed75f..d946890049 100644
--- a/scm/layout-beam.scm
+++ b/scm/layout-beam.scm
@@ -13,7 +13,7 @@
 "
   (let* ((thick (ly:grob-property beam 'thickness))
 	 (layout (ly:grob-layout beam))
-	 (lthick (ly:output-def-lookup layout 'linethickness))
+	 (lthick (ly:output-def-lookup layout 'line-thickness))
 	 (staff-thick lthick) ; fixme.
 	 (quant->coord (lambda (p q)
 			 (if (= 2 (abs q))
diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 7137f47de6..8970bc1e3b 100644
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -143,7 +143,7 @@
 ;;
 ;; - density scoring
 ;; - separate function for word-wrap style breaking?
-;; - raggedbottom? raggedlastbottom?
+;; - ragged-bottom? ragged-last-bottom?
 
 (define-public (optimal-page-breaks lines paper-book)
   "Return pages as a list starting with 1st page. Each page is a 'page Prob."
@@ -171,7 +171,7 @@ is what have collected so far, and has ascending page numbers."
 	   (prev-penalty (if (null? best-paths)
 			     0.0
 			     (page-penalty (car best-paths))))
-	 (inter-system-space (ly:output-def-lookup paper 'betweensystemspace))
+	 (inter-system-space (ly:output-def-lookup paper 'between-system-space))
 	 (relative-force (/ force inter-system-space))
 	 (abs-relative-force (abs relative-force)))
 
@@ -183,10 +183,10 @@ is what have collected so far, and has ascending page numbers."
 
   (define (space-systems page-height lines ragged?)
     (let* ((global-inter-system-space
-	    (ly:output-def-lookup paper 'betweensystemspace))
+	    (ly:output-def-lookup paper 'between-system-space))
 	   (top-space
-	    (ly:output-def-lookup paper 'pagetopspace))
-	   (global-fixed-dist (ly:output-def-lookup paper 'betweensystempadding))
+	    (ly:output-def-lookup paper 'page-top-space))
+	   (global-fixed-dist (ly:output-def-lookup paper 'between-system-padding))
 	   
 	   (system-vector (list->vector
 			   (append lines
@@ -254,11 +254,11 @@ is what have collected so far, and has ascending page numbers."
 		     (ideal (+
 			     (cond
 			      ((and title2? title1?)
-			       (ly:output-def-lookup paper 'betweentitlespace))
+			       (ly:output-def-lookup paper 'between-title-space))
 			      (title1?
-			       (ly:output-def-lookup paper 'aftertitlespace))
+			       (ly:output-def-lookup paper 'after-title-space))
 			      (title2?
-			       (ly:output-def-lookup paper 'beforetitlespace))
+			       (ly:output-def-lookup paper 'before-title-space))
 			      (else between-space))
 			     fixed))
 		     (hooke (/ 1 (- ideal fixed))))
@@ -283,7 +283,7 @@ is what have collected so far, and has ascending page numbers."
 	   (rods (map calc-rod (iota (1- system-count))))
 
 	   ;; we don't set ragged based on amount space left.
-	   ;; raggedbottomlast = ##T is much more predictable
+	   ;; ragged-bottomlast = ##T is much more predictable
 	   (result (ly:solve-spring-rod-problem
 		    springs rods space
 		    ragged?))
@@ -320,7 +320,7 @@ corresponding to DONE-LINES.
 CURRENT-BEST is the best result sofar, or #f."
 
     (let* ((this-page-num (if (null? best-paths)
-                              (ly:output-def-lookup paper 'firstpagenumber)
+                              (ly:output-def-lookup paper 'first-page-number)
                               (1+ (page-page-number (car best-paths)))))
 
 	   (this-page (make-page
@@ -329,8 +329,8 @@ CURRENT-BEST is the best result sofar, or #f."
 		       'is-last last?
 		       'page-number this-page-num))
 
-	   (ragged-all? (eq? #t (ly:output-def-lookup paper 'raggedbottom)))
-	   (ragged-last? (eq? #t (ly:output-def-lookup paper 'raggedlastbottom)))
+	   (ragged-all? (eq? #t (ly:output-def-lookup paper 'ragged-bottom)))
+	   (ragged-last? (eq? #t (ly:output-def-lookup paper 'ragged-last-bottom)))
 	   (ragged? (or ragged-all?
 			(and ragged-last?
 			     last?)))
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index e9e57d2750..0e41c16944 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -215,11 +215,11 @@ grestore\n"
    (ly:number->string y)
    s))
 
-(define (polygon points blotdiameter filled?)
+(define (polygon points blot-diameter filled?)
   (string-append
    (ly:numbers->string points) " "
    (ly:number->string (/ (length points) 2)) " "
-   (ly:number->string blotdiameter)
+   (ly:number->string blot-diameter)
    (if filled? " true " " false ")
    " draw_polygon"))
 
diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 5c2e0f74f4..9068f5b937 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -116,7 +116,7 @@
 (define (number->dim x)
   (string-append
    ;;ugh ly:* in backend needs compatibility func for standalone output
-   (ly:number->string x) " \\outputscale "))
+   (ly:number->string x) " \\output-scale "))
 
 (define (placebox x y s) 
   (string-append
@@ -147,8 +147,8 @@
 (define (resetcolor)
   (string-append "\\color[rgb]{0,0,0}\n"))
 
-(define (polygon points blotdiameter fill)
-  (embedded-ps (list 'polygon `(quote ,points) blotdiameter fill)))
+(define (polygon points blot-diameter fill)
+  (embedded-ps (list 'polygon `(quote ,points) blot-diameter fill)))
 
 (define (draw-line thick fx fy tx ty)
   (embedded-ps (list 'draw-line thick fx fy tx ty)))
diff --git a/scm/page.scm b/scm/page.scm
index 2420857f82..9d299e8ca7 100644
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -86,9 +86,9 @@
 
 (define (annotate-page layout stencil)
   (let*
-      ((topmargin (ly:output-def-lookup layout 'topmargin))
-       (vsize (ly:output-def-lookup layout 'vsize))
-       (bottommargin (ly:output-def-lookup layout 'bottommargin))
+      ((top-margin (ly:output-def-lookup layout 'top-margin))
+       (paper-height (ly:output-def-lookup layout 'paper-height))
+       (bottom-margin (ly:output-def-lookup layout 'bottom-margin))
        (add-stencil (lambda (y)
 		      (set! stencil
 			    (ly:stencil-add stencil y))
@@ -96,23 +96,23 @@
 
     (add-stencil
      (ly:stencil-translate-axis 
-      (annotate-y-interval layout "vsize"
-			   (cons (- vsize) 0)
+      (annotate-y-interval layout "paper-height"
+			   (cons (- paper-height) 0)
 			   #t)
       1 X))
     
 
     (add-stencil
      (ly:stencil-translate-axis 
-      (annotate-y-interval layout "topmargin"
-			   (cons (- topmargin) 0)
+      (annotate-y-interval layout "top-margin"
+			   (cons (- top-margin) 0)
 			   #t)
       2 X))
     
     (add-stencil
      (ly:stencil-translate-axis 
-      (annotate-y-interval layout "bottommargin"
-			   (cons (- vsize) (- bottommargin vsize))
+      (annotate-y-interval layout "bottom-margin"
+			   (cons (- paper-height) (- bottom-margin paper-height))
 			   #t)
       2 X))
     
@@ -171,15 +171,15 @@
 					   (cons (min 0 (* dir sep))
 						 (max 0 (* dir sep)))
 					   #t)
-		      (/ (ly:output-def-lookup layout 'linewidth) 2)
+		      (/ (ly:output-def-lookup layout 'line-width) 2)
 		      X)
 		     (if (= dir UP)
 			 (ly:stencil-translate-axis
 			  (annotate-y-interval layout
-					      "pagetopspace"
+					      "page-top-space"
 					      (cons
 					       (- (min 0 (* dir sep))
-						  (ly:output-def-lookup layout 'pagetopspace))
+						  (ly:output-def-lookup layout 'page-top-space))
 					       (min 0 (* dir sep)))
 					      #t)
 			  (+ 7 (interval-center (ly:stencil-extent head-stencil X))) X)
@@ -206,8 +206,8 @@
 		    'make-header
 		    'make-footer)
 		(if (= dir UP)
-		    'headsep
-		    'footsep)
+		    'heap-separation
+		    'foot-separation)
 		dir last?)))
 
 (define (page-header page)
@@ -219,23 +219,22 @@
 (define (layout->page-init layout)
   "Alist of settings for page layout"
   (let*
-      ((vsize (ly:output-def-lookup layout 'vsize))
-       (hsize (ly:output-def-lookup layout 'hsize))
+      ((paper-height (ly:output-def-lookup layout 'paper-height))
+       (paper-width (ly:output-def-lookup layout 'paper-width))
 
-       (lmargin (ly:output-def-lookup layout 'leftmargin))
-       (leftmargin (if lmargin
+       (lmargin (ly:output-def-lookup layout 'left-margin))
+       (left-margin (if lmargin
 		       lmargin
-		       (/ (- hsize
-			     (ly:output-def-lookup layout 'linewidth)) 2)))
-       
-       (bottom-edge (- vsize
-		       (ly:output-def-lookup layout 'bottommargin)))
-       (top-margin (ly:output-def-lookup layout 'topmargin))
+		       (/ (- paper-width
+			     (ly:output-def-lookup layout 'line-width)) 2)))
+       (bottom-edge (- paper-height
+		       (ly:output-def-lookup layout 'bottom-margin)) )
+       (top-margin (ly:output-def-lookup layout 'top-margin))
        )
     
-    `((vsize . ,vsize)
-      (hsize . ,hsize)
-      (left-margin . ,leftmargin)
+    `((paper-height . ,paper-height)
+      (paper-width . ,paper-width)
+      (left-margin . ,left-margin)
       (top-margin . ,top-margin)
       (bottom-edge . ,bottom-edge)
       )))
@@ -258,10 +257,10 @@ create offsets.
        (lines (page-lines page))
        (number (page-page-number page))
 
-       ;; TODO: naming vsize/hsize not analogous to TeX.
+       ;; TODO: naming paper-height/paper-width not analogous to TeX.
 
        
-       (system-xoffset (ly:output-def-lookup layout 'horizontalshift 0.0))
+       (system-xoffset (ly:output-def-lookup layout 'horizontal-shift 0.0))
        (system-separator-markup (ly:output-def-lookup layout 'systemSeparatorMarkup))
        (system-separator-stencil (if (markup? system-separator-markup)
 				     (interpret-markup layout
@@ -275,7 +274,7 @@ create offsets.
 
        (page-stencil (ly:make-stencil
 		      '()
-		      (cons (prop 'left-margin) (prop 'hsize))
+		      (cons (prop 'left-margin) (prop 'paper-width))
 		      (cons (- (prop 'top-margin)) 0)))
 
        (last-system #f)
@@ -383,9 +382,9 @@ create offsets.
        (scopes (ly:paper-book-scopes p-book))
        (number (page-page-number page))
        (last? (page-property page 'is-last))
-       (h (- (ly:output-def-lookup layout 'vsize)
-	       (ly:output-def-lookup layout 'topmargin)
-	       (ly:output-def-lookup layout 'bottommargin)))
+       (h (- (ly:output-def-lookup layout 'paper-height)
+	       (ly:output-def-lookup layout 'top-margin)
+	       (ly:output-def-lookup layout 'bottom-margin)))
        
        (head (page-property page 'head-stencil))
        (foot (page-property page 'foot-stencil))
diff --git a/scm/paper-system.scm b/scm/paper-system.scm
index e72795516e..eec080e253 100644
--- a/scm/paper-system.scm
+++ b/scm/paper-system.scm
@@ -64,10 +64,10 @@
        (bbox-extent (paper-system-extent system Y))
        (refp-extent (ly:prob-property system 'refpoint-Y-extent))
        (next-space (ly:prob-property system 'next-space
-					     (ly:output-def-lookup layout 'betweensystemspace)
+					     (ly:output-def-lookup layout 'between-system-space)
 					     ))
        (next-padding (ly:prob-property system 'next-padding
-					       (ly:output-def-lookup layout 'betweensystempadding)
+					       (ly:output-def-lookup layout 'between-system-padding)
 					       ))
 		     
        )
diff --git a/scm/paper.scm b/scm/paper.scm
index 18285a2e64..19e92824cb 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -6,12 +6,12 @@
 
 (define-public (set-paper-dimension-variables mod)
   (module-define! mod 'dimension-variables
-		  '(pt mm cm in staffheight staff-space
-		       pagetopspace
-		       betweensystemspace betweensystempadding
-		       linewidth indent hsize vsize horizontalshift
-		       staffspace linethickness ledgerlinethickness
-		       blotdiameter leftmargin rightmargin)))
+		  '(pt mm cm in staff-height staff-space
+		       page-top-space
+		       between-system-space between-system-padding
+		       line-width indent paper-width paper-height horizontal-shift
+		       staff-space line-thickness ledgerline-thickness
+		       blot-diameter left-margin right-margin)))
 
 (define-public (layout-set-staff-size sz)
   "Function to be called inside a \\layout{} block to set the staff size."
@@ -35,20 +35,20 @@
 
     (module-define! m 'text-font-size (* 12 (/ sz (* 20 pt))))
     
-    (module-define! m 'outputscale ss)
+    (module-define! m 'output-scale ss)
     (module-define! m 'fonts
 		    (if tex-backend?
 			(make-cmr-tree (/  sz (* 20 pt)))
 			(make-century-schoolbook-tree
 			 (/ sz (* 20 pt)))))
-    (module-define! m 'staffheight sz)
+    (module-define! m 'staff-height sz)
+    (module-define! m 'staff-space ss)
     (module-define! m 'staff-space ss)
-    (module-define! m 'staffspace ss)
 
     ;; !! synchronize with feta-params.mf
-    (module-define! m 'linethickness lt)
-    (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
-    (module-define! m 'blotdiameter (* 0.4 pt))
+    (module-define! m 'line-thickness lt)
+    (module-define! m 'ledgerline-thickness (+ (* 0.5 pt) (/ ss 10)))
+    (module-define! m 'blot-diameter (* 0.4 pt))
     ))
 
 (define-safe-public (set-global-staff-size sz)
@@ -88,9 +88,9 @@
 (define (set-paper-dimensions m w h)
   "M is a module (i.e. layout->scope_ )"
   (let* ((mm (eval 'mm m)))
-    (module-define! m 'hsize w)
-    (module-define! m 'vsize h)
-    (module-define! m 'linewidth (- w (* 20 mm)))
+    (module-define! m 'paper-width w)
+    (module-define! m 'paper-height h)
+    (module-define! m 'line-width (- w (* 20 mm)))
     (module-define! m 'indent (/ w 14))
 
     ;; page layout - what to do with (printer specific!) margin settings?
@@ -152,7 +152,7 @@
 	     (module-define! scope v
 			     (/ val scale))
 
-	     ;; spurious warnings, eg. for hsize, vsize. 
+	     ;; spurious warnings, eg. for paper-width, paper-height. 
 	     ;; (ly:warning (_ "not a number, ~S = ~S " v  val))
 	     )))
      
diff --git a/scm/titling.scm b/scm/titling.scm
index fa02078258..f6ac5f0b12 100644
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -6,8 +6,8 @@
 ;;;;          Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 (define-public (layout-extract-page-properties layout)
-  (list (append `((linewidth . ,(ly:paper-get-number
-				 layout 'linewidth)))
+  (list (append `((line-width . ,(ly:paper-get-number
+				 layout 'line-width)))
 		(ly:output-def-lookup layout 'text-font-defaults))))
 
 ;;;;;;;;;;;;;;;;;;
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 9c22d98fa8..63814ac985 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -168,7 +168,6 @@ def do_one_file (infile_name):
 	(last, result) = do_conversion (infile.read (), from_version, to_version)
 	infile.close ()
 
-
 	if last:
 		newversion = r'\version "%s"' % tup_to_str (last)
 		if lilypond_version_re.search (result):