Francisco Vila <[email protected]> writes:
> 2014-02-13 10:47 GMT+01:00 David Kastrup <[email protected]>:
>> Looking at git log --stat it would appear that I did not realize changes
>> to be in both files. However, in order to avoid unexpected changes
>> (even if just in whitespace etc),
>
> Yes, what makelsr does to the same snippets in snippets/ only is the
> same I did in my patch, except it also adds a newline.
>
>> one should always just do the changes
>> in snippets/new manually and then commit the makelsr run separately.
>
> Understood.
>
> Running makelsr after my changes on snippets/new changes version to 3
> unrelated snippets.
Then there were changes in snippets/new that would have warranted a
makelsr run previously.
If one does not want intermingling changes, it's possible to split the
work into three commits:
Run makelsr, do manual changes to snippets/new, run makelsr.
It's possible but not required to combine the first step with "fume at
whoever committed the changes to snippets/new without running makelsr".
If we take a look at what happened, we see something like
commit 74843362972efd8b7a76419da499c0f5a920663d
Author: David Kastrup <[email protected]>
Date: Sun Feb 2 13:23:27 2014 +0100
Rerun scripts/auxiliar/update-with-convert-ly.sh
diff --git a/Documentation/snippets/broken-crescendo-hairpin.ly
b/Documentation/
index 68960a5..2e5aad4 100644
--- a/Documentation/snippets/broken-crescendo-hairpin.ly
+++ b/Documentation/snippets/broken-crescendo-hairpin.ly
@@ -5,7 +5,7 @@
%
% This file is in the public domain.
%% Note: this file works from version 2.17.27
-\version "2.17.27"
+\version "2.19.2"
\header {
lsrtags = "contemporary-notation, expressive-marks, symbols-and-glyphs"
@@ -44,7 +44,7 @@ draw the rectangle over the hairpin.
des16_\markup \with-dimensions #'(2 . 7) #'(0 . 0)
\with-color #white
\filled-box #'(2 . 7) #'(0 . 2) #0
- r8. des4 ~ des16->\sff
+ r8. des4 ~ 16->\sff
}
>>
}
diff --git a/Documentation/snippets/new/broken-crescendo-hairpin.ly
b/Documentat
index 27df944..f14c983 100644
--- a/Documentation/snippets/new/broken-crescendo-hairpin.ly
+++ b/Documentation/snippets/new/broken-crescendo-hairpin.ly
@@ -1,4 +1,4 @@
-\version "2.17.27"
+\version "2.19.2"
\header {
lsrtags = "contemporary-notation, expressive-marks, symbols-and-glyphs"
@@ -36,7 +36,7 @@ draw the rectangle over the hairpin.
des16_\markup \with-dimensions #'(2 . 7) #'(0 . 0)
\with-color #white
\filled-box #'(2 . 7) #'(0 . 2) #0
- r8. des4 ~ des16->\sff
+ r8. des4 ~ 16->\sff
}
>>
}
So it turns out that the changes were done _mechanically_ in both files
without updating the comment
%% Note: this file works from version 2.17.27
Frankly, the comment appears rather redundant. Maybe we should either
teach convert-ly about it, or keep makelsr from generating it in the
first place.
--
David Kastrup
_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel
