From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 2 Feb 2006 01:18:40 +0000 (+0000)
Subject: (FatalConversionError.sub_cxx_id):
X-Git-Tag: release/2.7.31~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e4ce7cdb97d06d731ef333f33aca25ad1e2a3a5e;p=lilypond.git

(FatalConversionError.sub_cxx_id):
anticipate on identifier substitutions.
---

diff --git a/ChangeLog b/ChangeLog
index 2e453c3024..4b2e373421 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* python/convertrules.py (FatalConversionError.sub_cxx_id):
+	anticipate on identifier substitutions.
+
 2006-02-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* flower/include/std-vector.hh (insert): Remove, replace by
diff --git a/python/convertrules.py b/python/convertrules.py
index 5be6856802..9970696780 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2696,6 +2696,39 @@ def conv (str):
 		
 	str = re.sub (r'([A-Z][a-z_0-9]+::[a-z_0-9]+)',
 		      sub_cxx_id, str)
+
+	identifier_subs = [
+		('inputencoding', 'input-encoding'),
+		('printpagenumber', 'print-page-number'),
+		('outputscale', 'output-scale'),
+		('betweensystemspace', 'between-system-space'),
+		('betweensystempadding', 'between-system-padding'),
+		('pagetopspace', 'page-top-space'),
+		('raggedright', 'ragged-right'),
+		('raggedbottom', 'ragged-bottom'),
+		('raggedlastbottom', 'ragged-last-bottom'),
+		('aftertitlespace', 'after-title-space'),
+		('beforetitlespace', 'before-title-space'),
+		('betweentitlespace', 'between-title-space'),
+		('topmargin', 'top-margin'),
+		('bottommargin', 'bottom-margin'),
+		('headsep', 'heap-separation'),
+		('footsep', 'foot-separation'),
+		('rightmargin', 'right-margin'),
+		('leftmargin', 'left-margin'),
+		('firstpagenumber', 'first-page-number'),
+		('printfirstpagenumber', 'print-first-page-number'),
+		('hsize', 'paper-width'),
+		('vsize', 'paper-height'),
+		('horizontalshift', 'horizontal-shift'),
+		('staffspace', 'staff-space'),
+		('linethickness', 'line-thickness'),
+		('ledgerlinethickness', 'ledger-line-thickness'),
+		('blotdiameter', 'blot-diameter'),
+		('staffheight', 'staff-height'),
+		('linewidth', 'line-width')
+		]
+	
 	return str
 
 conversions.append (((2, 7, 31), conv,
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index e4517fe487..59ed71e53e 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -157,10 +157,7 @@
      (sanitize-tex-string texpaper)
      (if landscape? ",landscape" "")
      "}%\n"
-     (tex-string-def
-      "lilypondpaper" 'interscoreline
-      (ly:number->string
-       (* scale (ly:output-def-lookup paper 'interscoreline)))))))
+     )))
 
 (define (header-end)
   (string-append
diff --git a/scm/paper.scm b/scm/paper.scm
index 1ee7fc3179..18285a2e64 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -11,7 +11,7 @@
 		       betweensystemspace betweensystempadding
 		       linewidth indent hsize vsize horizontalshift
 		       staffspace linethickness ledgerlinethickness
-		       blotdiameter interscoreline leftmargin rightmargin)))
+		       blotdiameter leftmargin rightmargin)))
 
 (define-public (layout-set-staff-size sz)
   "Function to be called inside a \\layout{} block to set the staff size."
@@ -49,7 +49,7 @@
     (module-define! m 'linethickness lt)
     (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
     (module-define! m 'blotdiameter (* 0.4 pt))
-    (module-define! m 'interscoreline (* 4 mm))))
+    ))
 
 (define-safe-public (set-global-staff-size sz)
   "Set the default staff size, where SZ is thought to be in PT."