Reviewers: Bertrand Bordage,
Message:
On 2011/10/23 21:08:09, Bertrand Bordage wrote:
LGTM. You'll be happy to know that Mike and I are currently trying to
get rid
of \markuplines, so that there will only be a \markup command.
No, I am not happy, since for example fret markings in tabulatures are a
perfect match for markup lists (and calling them markuplines is quite
obscuring this wonderful way of defining them).
Description:
Rename \markuplines to \markuplist (before running convert-ly)
This inconsistency has been annoying me for years. Don't forget to
run scripts/auxiliar/update-with-convert-ly in input/regression and
Documentation before doing the checks.
Please review this at http://codereview.appspot.com/5312050/
Affected files:
M lily/lily-lexer.cc
M lily/parser.yy
M ly/toc-init.ly
M python/convertrules.py
Index: lily/lily-lexer.cc
diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index
6c1336744b3286f6e2f0ca21d13ad8c5d4a508ca..1298604f12f704bccbf48299bc5caa3a366164a2
100644
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -67,7 +67,7 @@ static Keyword_ent the_key_tab[]
{"lyricsto", LYRICSTO},
{"mark", MARK},
{"markup", MARKUP},
- {"markuplines", MARKUPLINES},
+ {"markuplist", MARKUPLIST},
{"midi", MIDI},
{"name", NAME},
{"new", NEWCONTEXT},
Index: lily/parser.yy
diff --git a/lily/parser.yy b/lily/parser.yy
index
f2ef9b0cb54f33892be60971ca930bbad9d4d3b3..9b2f2683e73d533530b7ea880d7f1f6ebaba832f
100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -58,7 +58,7 @@ or
%right FUNCTION_ARGUMENTS
MARKUP LYRICS_STRING MARKUP_IDENTIFIER STRING STRING_IDENTIFIER
- MARKUPLINES WITH CONTEXT_MOD_IDENTIFIER MARKUPLINES_IDENTIFIER
+ MARKUPLIST WITH CONTEXT_MOD_IDENTIFIER MARKUPLIST_IDENTIFIER
SCORE BOOK BOOKPART PAPER LAYOUT MIDI
SEQUENTIAL SIMULTANEOUS DOUBLE_ANGLE_OPEN MUSIC_IDENTIFIER '{'
PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
@@ -225,7 +225,7 @@ void set_music_properties (Music *p, SCM a);
%token LYRICSTO "\\lyricsto"
%token MARK "\\mark"
%token MARKUP "\\markup"
-%token MARKUPLINES "\\markuplines"
+%token MARKUPLIST "\\markuplist"
%token MIDI "\\midi"
%token NAME "\\name"
%token NOTEMODE "\\notemode"
@@ -322,7 +322,7 @@ If we give names, Bison complains.
%token <scm> MARKUP_FUNCTION
%token <scm> MARKUP_LIST_FUNCTION
%token <scm> MARKUP_IDENTIFIER
-%token <scm> MARKUPLINES_IDENTIFIER
+%token <scm> MARKUPLIST_IDENTIFIER
%token <scm> MUSIC_FUNCTION
%token <scm> MUSIC_IDENTIFIER
%token <scm> NOTENAME_PITCH
@@ -2642,10 +2642,10 @@ lyric_markup:
;
full_markup_list:
- MARKUPLINES_IDENTIFIER {
+ MARKUPLIST_IDENTIFIER {
$$ = $1;
}
- | MARKUPLINES
+ | MARKUPLIST
{ PARSER->lexer_->push_markup_state (); }
markup_list {
$$ = $3;
@@ -2678,7 +2678,7 @@ markup_top:
;
markup_list:
- MARKUPLINES_IDENTIFIER {
+ MARKUPLIST_IDENTIFIER {
$$ = $1;
}
| markup_composed_list {
@@ -2879,7 +2879,7 @@ Lily_lexer::try_special_identifiers (SCM
*destination, SCM sid)
return MARKUP_IDENTIFIER;
} else if (Text_interface::is_markup_list (sid)) {
*destination = sid;
- return MARKUPLINES_IDENTIFIER;
+ return MARKUPLIST_IDENTIFIER;
}
return -1;
Index: ly/toc-init.ly
diff --git a/ly/toc-init.ly b/ly/toc-init.ly
index
55b48b96c2fec65040489667e5768e86ff093d21..4b58183c071368e6871bf6ea20a56c70ff920e25
100644
--- a/ly/toc-init.ly
+++ b/ly/toc-init.ly
@@ -1,4 +1,4 @@
-\version "2.14.0"
+\version "2.15.15"
%% defined later, in a closure
#(define-public (add-toc-item! markup-symbol text)
@@ -38,7 +38,7 @@ tocItemWithDotsMarkup = \markup \fill-with-pattern #1
#RIGHT .
( _i "Outputs the table of contents, using the paper variable
@code{tocTitleMarkup} for its title, then the list of lines
built using the @code{tocItem} music function
-Usage: @code{\\markuplines \\table-of-contents}" )
+Usage: @code{\\markuplist \\table-of-contents}" )
(cons (interpret-markup layout props
(ly:output-def-lookup layout 'tocTitleMarkup))
(space-lines (chain-assoc-get 'baseline-skip props)
Index: python/convertrules.py
diff --git a/python/convertrules.py b/python/convertrules.py
index
ee15d267c7222cdd0dc2b52b41415f6108bec483..efa2c9f45302e4f84e597e0269b6f235527f4a36
100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3242,6 +3242,11 @@ def conv (str):
str = re.sub (r"((?:\\once)?\s*)\\revert\s*Stem\s+#'transparent",
r"\g<1>\\revert Stem #'transparent \g<1>\\revert Flag #'transparent", str)
return str
+@rule ((2, 15, 15), "\\markuplines -> \\markuplist")
+def conv (str):
+ str = re.sub (r"\\markuplines", r"\\markuplist", str)
+ str = re.sub (r"@funindex markuplines", r"@funindex markuplist", str)
+ return str
# Guidelines to write rules (please keep this at the end of this file)
#
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
