* lily/parser.yy: get rid off < > in markups by treating { } as

real lists.

* lily/lexer.ll: remove < > from markup lexer mode.

* scm/new-markup.scm (map-markup-command-list): helper function
used in parser.yy to map markup commands on a markup list.

* scripts/convert-ly.py (conv): add rule for converting
\markup < > to \markup { }

* ly/titling-init.ly:
* input/test/coriolan-margin.ly:
* input/regression/new-markup-syntax.ly:
* input/regression/new-markup-scheme.ly:
* input/regression/multi-measure-rest-text.ly:
* input/regression/markup-stack.ly:
* input/regression/markup-score.ly:
* input/regression/instrument-name-markup.ly:
* input/mutopia/W.A.Mozart/mozart-hrn-3.ly:
* input/mutopia/R.Schumann/romanze-op28-2.ly:
* input/mutopia/J.S.Bach/wtk1-fugue2.ly:
* input/wilhelmus.ly:
* Documentation/user/notation.itely:
* Documentation/user/music-glossary.tely:
* Documentation/user/changing-defaults.itely: change < > to { } in
markups

1 files changed, 29 insertions, 29 deletions

diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index bea90f7ebc..47f6e390a7 100644
--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -1,58 +1,58 @@
 bookTitleMarkup = \markup {
-  \column <
-    \fill-line < \fromproperty #'header:dedication >
-    \fill-line <
+  \column {
+    \fill-line { \fromproperty #'header:dedication }
+    \fill-line {
       \huge \bigger \bigger \bigger \bold \fromproperty #'header:title
-    >
-    \fill-line <
+    }
+    \fill-line {
       \override #'(baseline-skip . 3)
-      \column <
-	\fill-line <
+      \column {
+	\fill-line {
 	  \huge \bigger \bigger
 	  \bold \fromproperty #'header:subtitle
-	>
-	\fill-line <
+	}
+	\fill-line {
 	  \huge \bigger
 	  \bold \fromproperty #'header:subsubtitle
-	>
-      >
-    >
-    \fill-line <
+	}
+      }
+    }
+    \fill-line {
       \fromproperty #'header:poet
       \fromproperty #'header:instrument 
-      \column <
+      \column {
 	\fromproperty #'header:composer
 	\fromproperty #'header:arranger
-      >
-    >
-  >
+      }
+    }
+  }
 }
 
 scoreTitleMarkup = \markup {
-  \fill-line <
+  \fill-line {
     \fromproperty #'header:piece
     \fromproperty #'header:opus
-  >
+  }
 }
 
 
 oddHeaderMarkup = \markup
-\fill-line <
+\fill-line {
   ""
   \fromproperty #'header:instrument
   \fromproperty #'page:page-number-string
->
+}
 
 evenHeaderMarkup = \markup
-\fill-line <
+\fill-line {
   \fromproperty #'page:page-number-string
   \fromproperty #'header:instrument
   ""
->
+}
 
 oddFooterMarkup = \markup {
-  \column <
-    \fill-line <
+  \column {
+    \fill-line {
 
       % put copyright only on pagenr. 1 
       \on-the-fly #(lambda (layout props arg)
@@ -61,8 +61,8 @@ oddFooterMarkup = \markup {
 		     empty-stencil
 		   ))
       \fromproperty #'header:copyright
-    >
-    \fill-line <
+    }
+    \fill-line {
       % put tagline only on last page
       \on-the-fly #(lambda (layout props arg)
 		    (if (chain-assoc-get 'page:last?  props #f)
@@ -70,7 +70,7 @@ oddFooterMarkup = \markup {
 		     empty-stencil
 		   ))
       \fromproperty #'header:tagline
-    >
-  >
+    }
+  }
 }