Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / Documentation / snippets / markup-lines.ly

diff --git a/Documentation/snippets/markup-lines.ly b/Documentation/snippets/markup-lines.ly
index 5185ea4e9f593649670b20aff5987519db156452..2503a0bac92419ec49427f807568a24f2627169f 100644 (file)
--- a/Documentation/snippets/markup-lines.ly
+++ b/Documentation/snippets/markup-lines.ly
@@ -1,19 +1,23 @@
-%% Do not edit this file; it is automatically
+%% DO NOT EDIT this file manually; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.17.11"
 
 \header {
   lsrtags = "text"
 
   texidoc = "
 Text that can spread over pages is entered with the
-@code{\\markuplines} command.
+@code{\\markuplist} command.
 
 "
   doctitle = "Markup lines"
 } % begin verbatim
 
+
 #(set-default-paper-size "a6")
 
 #(define-markup-list-command (paragraph layout props args) (markup-list?)
@@ -21,7 +25,7 @@ Text that can spread over pages is entered with the
    (make-justified-lines-markup-list (cons (make-hspace-markup 2) args))))
 
 % Candide, Voltaire
-\markuplines {
+\markuplist {
   \override-lines #'(baseline-skip . 2.5) {
     \paragraph {
       Il y avait en Westphalie, dans le château de M. le baron de