From 2ed37043251e3bab03c50383073b044bb6074661 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 22 Oct 2000 01:36:04 +0200
Subject: [PATCH] patch::: 1.3.96.jcn10

1.3.96.jcn10
============

* Made small fixes to basic properties: regression-test compiles.
---
 CHANGES                      |  5 +++++
 VERSION                      |  2 +-
 scm/element-descriptions.scm | 35 ++++++++++++++++++++++++++++++-----
 scm/generic-property.scm     |  4 ++++
 scm/interface.scm            |  9 +++++++++
 5 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7f4589422d..51db323a62 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.96.jcn10
+============
+
+* Made small fixes to basic properties: regression-test compiles.
+
 1.3.96.jcn9
 ===========
 
diff --git a/VERSION b/VERSION
index 8a957f0f5c..b2a0012dcc 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=96
-MY_PATCH_LEVEL=jcn9
+MY_PATCH_LEVEL=jcn10
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm
index 25784adfe8..504cdfc4cc 100644
--- a/scm/element-descriptions.scm
+++ b/scm/element-descriptions.scm
@@ -41,7 +41,7 @@
                 (properties-to-font-name . ,properties-to-font-name)
                 (style-to-font-name . ,style-to-font-name)
                 (markup-to-properties . ,markup-to-properties)
-                (font-family . roman)
+                (font-family . "roman")
 		(meta . ,(element-description "BarNumber"
 			text-interface general-element-interface break-aligned-interface))
 	))
@@ -202,7 +202,7 @@
  		(properties-to-font-name . ,properties-to-font-name)
  		(style-to-font-name . ,style-to-font-name)
  		(markup-to-properties . ,markup-to-properties)
- 		(font-family . roman)
+ 		(font-family . "roman")
 		(meta . ,(element-description "InstrumentName" general-element-interface text-interface break-aligned-interface))
 	))
 	
@@ -246,7 +246,7 @@
 		(properties-to-font-name . ,properties-to-font-name)
 		(style-to-font-name . ,style-to-font-name)
 		(markup-to-properties . ,markup-to-properties)
-		(font-family . roman)
+		(font-family . "roman")
                 
 		(meta . ,(element-description "LyricText" lyric-syllable-interface text-interface))
 	))
@@ -270,7 +270,11 @@
 		(expand-limit . 10)
 		(padding . 2.0) ; staffspace
 		(minimum-width . 12.5) ; staffspace
-		(meta . ,(element-description "MultiMeasureRest" multi-measure-rest-interface general-element-interface))
+		(properties-to-font-name . ,properties-to-font-name)
+		(style-to-font-name . ,style-to-font-name)
+		(markup-to-properties . ,markup-to-properties)
+		(font-family . "number")
+                (meta . ,(element-description "MultiMeasureRest" multi-measure-rest-interface general-element-interface))
 	))
 	
 	(NoteColumn . (
@@ -287,6 +291,19 @@
 			note-head-interface general-element-interface))
 	))
 
+	(NoteName . (
+		(style . default)
+		(molecule-callback . ,Text_item::brew_molecule)
+                (properties-to-font-name . ,properties-to-font-name)
+                (style-to-font-name . ,style-to-font-name)
+                (markup-to-properties . ,markup-to-properties)
+		(font-family . "roman")
+		(font-size . "0")
+		(meta . ,(element-description  "NoteName"
+			note-name-interface
+			general-element-interface))
+	))
+
 	(OctavateEight . (
 		(self-alignment-X . 0)
 		(text . "8")
@@ -374,7 +391,11 @@
 		(molecule-callback . ,Text_item::brew_molecule)		
 		(break-align-symbol . Clef_item)
 		(visibility-lambda . ,begin-of-line-visible)
-		(meta . ,(element-description "StanzaNumber" break-aligned-interface text-interface))
+		(properties-to-font-name . ,properties-to-font-name)
+                (style-to-font-name . ,style-to-font-name)
+                (markup-to-properties . ,markup-to-properties)
+		(font-family . "roman")
+(meta . ,(element-description "StanzaNumber" break-aligned-interface text-interface))
 	))
 
 	(StaffSymbol . (
@@ -464,6 +485,10 @@
 		(molecule-callback . ,Text_item::brew_molecule)
 		(no-spacing-rods . #t)
 		(padding . 0.5)
+		(properties-to-font-name . ,properties-to-font-name)
+                (style-to-font-name . ,style-to-font-name)
+                (markup-to-properties . ,markup-to-properties)
+		(font-family . "roman")
 		(meta . ,(element-description "TextScript" text-script-interface text-interface side-position-interface general-element-interface))
 	))
 	(TextSpanner . (
diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index 6de6407461..2903c24d0c 100644
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -162,6 +162,10 @@
   (cons 'note-head-interface
 	(list (list 'noteHeadStyle symbol? 'style))))
 
+(define generic-notename-properties
+  (cons 'note-name-interface
+	(list (list 'noteNaemStyle symbol? 'style))))
+
 
 (define generic-rest-properties
   (cons 'rest-interface
diff --git a/scm/interface.scm b/scm/interface.scm
index 24459840d1..c5dc2d9d55 100644
--- a/scm/interface.scm
+++ b/scm/interface.scm
@@ -175,6 +175,15 @@ more than this (in staffspace)")
     )
    ))
 
+(define note-name-interface
+  (lily-interface
+   'note-name-interface
+   "Note naem"
+   (list
+    (property-description 'style symbol? "symbol that sets note name style")
+    )
+   ))
+
 
 (define rhythmic-head-interface
   (lily-interface
-- 
2.39.5