Fix bad rotation center from issue 5346 (issue 341380043 by d...@gnu.org)
Yup, that's it! Now it behaves exactly identical to Stencil::rotate_degrees and the PNG regtests are successfull, too. Thanks! Torsten https://codereview.appspot.com/341380043/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: make doc bombs out in MusicXML
Hello On Sat, 16 Jun 2018 14:20:43 +0100 (BST), "James Lowe" wrote: > Hello > > On Sat, 16 Jun 2018 09:10:10 -0400, Dan Eble wrote: > > > On Jun 16, 2018, at 08:46, James Lowe wrote: > > > > > > Well before I applied those patches on behalf of Alexander's patches I > > > did a full patch test with the patches applied and had no problems. > > > > > > However ... I know that there are some 'prgramming errors' reported that > > > do not break patch testing. I wonder if this is something like that. > > > > > > My work machine will be running merge every 4 hours, but I'll kick one > > > off from home now (~ 13:45 BST) > > > > I assume that I should wait until this situation is resolved before pushing > > my own patch. If it does not matter, please let me know. > > — > > It should be done quite soon. I'll send an email either way. Well it pushed to master without complaint. I don't know what else to add. James ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Fix GC issue in skyline rotations (issue 344960043 by d...@gnu.org)
Reviewers: Be-3, Message: On 2018/06/16 12:33:50, Be-3 wrote: First of all: thanks for taking care of this issue! But the resulting skylines don't quite work as expected yet (see attached image in the issue tracker). Seems to be a problem with the centre of rotation co-ordinates. Greetings, Torsten I assumed that the center coordinates of Stencil::rotate are, well, the center coordinates. They aren't. They are some sort of relative contraption focused around the bounding box. Unlikely I'll get this fixed today but I'll probably try on the train. Description: Fix GC issue in skyline rotations This was issue 5341 initially and is a fix for a problem introduced during issue 5319. The problem basically is that a rotated Stencil is created and its stencil expression is getting stored on the heap without retaining any pointer to it in areas scanned during garbage collections. This fix is a minimal one that merely avoids creating a stencil and instead simulates the effect on the transform matrix to be expected from using a rotated stencil. Please review this at https://codereview.appspot.com/344960043/ Affected files (+6, -6 lines): M lily/stencil-integral.cc Index: lily/stencil-integral.cc diff --git a/lily/stencil-integral.cc b/lily/stencil-integral.cc index bc2bc2b41d363166d77b5bca97d67090f1bbb9b4..33fbea6797844a3440e0f013ab0433ad05a88d40 100644 --- a/lily/stencil-integral.cc +++ b/lily/stencil-integral.cc @@ -1128,12 +1128,12 @@ Stencil::skylines_from_stencil (SCM sten, Real pad, SCM rot, Axis a) Real angle = robust_scm2double (scm_car (rot), 0.0); Real x = robust_scm2double (scm_cadr (rot), 0.0); Real y = robust_scm2double (scm_caddr (rot), 0.0); - /* pass over a rotated copy of the stencil */ - Stencil *q = unsmob (s->smobbed_copy ()); - q->rotate_degrees (angle, Offset (x, y)); - data = stencil_traverser - (make_transform_matrix (1.0, 0.0, 0.0, 1.0, 0.0, 0.0), -q->expr ()); + PangoMatrix trans = make_transform_matrix (1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + pango_matrix_translate (, x, y); + pango_matrix_rotate (, -angle); + pango_matrix_translate (, -x, -y); + + data = stencil_traverser (trans, s->expr ()); } vector boxes; ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: make doc bombs out in MusicXML
Hello On Sat, 16 Jun 2018 09:10:10 -0400, Dan Eble wrote: > On Jun 16, 2018, at 08:46, James Lowe wrote: > > > > Well before I applied those patches on behalf of Alexander's patches I did > > a full patch test with the patches applied and had no problems. > > > > However ... I know that there are some 'prgramming errors' reported that do > > not break patch testing. I wonder if this is something like that. > > > > My work machine will be running merge every 4 hours, but I'll kick one off > > from home now (~ 13:45 BST) > > I assume that I should wait until this situation is resolved before pushing > my own patch. If it does not matter, please let me know. > — It should be done quite soon. I'll send an email either way. James ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: make doc bombs out in MusicXML
On Jun 16, 2018, at 08:46, James Lowe wrote: > > Well before I applied those patches on behalf of Alexander's patches I did a > full patch test with the patches applied and had no problems. > > However ... I know that there are some 'prgramming errors' reported that do > not break patch testing. I wonder if this is something like that. > > My work machine will be running merge every 4 hours, but I'll kick one off > from home now (~ 13:45 BST) I assume that I should wait until this situation is resolved before pushing my own patch. If it does not matter, please let me know. — Dan ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: make doc bombs out in MusicXML
Hello, On Sat, 16 Jun 2018 14:21:28 +0200, David Kastrup wrote: > > I get the following: > > lilypond-book.py: error: `musicxml2ly --out=- - ' failed (0) > lilypond-book.py: error: The error log is as follows: > musicxml2ly: Reading MusicXML from Standard input ... > musicxml2ly: Converting to LilyPond expressions... > Traceback (most recent call last): > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3297, in > > main() > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3291, in > main > voices = convert(filename, options) > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3168, in > convert > (voices, staff_info) = get_all_voices(parts) > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 2776, in > get_all_voices > voice = musicxml_voice_to_lily_voice(v) > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 2332, in > musicxml_voice_to_lily_voice > for direction in musicxml_direction_to_lily(n): > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 1580, in > musicxml_direction_to_lily > event = musicxml_metronome_to_ly(next_entry, entry) > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 1490, in > musicxml_metronome_to_ly > ev.set_text(text_event.get_text().strip()) > AttributeError: TempoMark instance has no attribute 'set_text' > /tmp/build-lilypond-autobuild/scripts/build/out/texi2omf --format pdf > --location > /usr/local/share/doc/lilypond/html/input/regression/musicxml/collated-files.pdf > --version 2.21.0 out-www/collated-files.texi > > out-www/collated-files.pdf.omf > Traceback (most recent call last): > File "/tmp/build-lilypond-autobuild/scripts/build/out/texi2omf", line 73, > in > texi = open (infile).read () > IOError: [Errno 2] No such file or directory: 'out-www/collated-files.texi' > /tmp/lilypond-autobuild/./make/ly-rules.make:43: recipe for target > 'out-www/collated-files.pdf.omf' failed > make[4]: *** [out-www/collated-files.pdf.omf] Error 1 > > This is standard lilypond-patchy-staging on my side so I am somewhat > puzzled why with this error in place (which appears to point to an > inconsistency in musicxml) the current state of master could have > included this patch. Maybe my version of Python is less lenient about > undefined members or something? > > At any rate, I lean towards reverting the work of Alexander Myltsev > until this has been cleared up. > > Opinions? > > -- Well before I applied those patches on behalf of Alexander's patches I did a full patch test with the patches applied and had no problems. However ... I know that there are some 'prgramming errors' reported that do not break patch testing. I wonder if this is something like that. My work machine will be running merge every 4 hours, but I'll kick one off from home now (~ 13:45 BST) James ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Fix GC issue in skyline rotations (issue 344960043 by d...@gnu.org)
First of all: thanks for taking care of this issue! But the resulting skylines don't quite work as expected yet (see attached image in the issue tracker). Seems to be a problem with the centre of rotation co-ordinates. Greetings, Torsten https://codereview.appspot.com/344960043/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Issue 5344: Avoid repeated calculation of accepted contexts (issue 346080043 by nine.fierce.ball...@gmail.com)
https://codereview.appspot.com/346080043/diff/1/lily/acceptance-set.cc File lily/acceptance-set.cc (right): https://codereview.appspot.com/346080043/diff/1/lily/acceptance-set.cc#newcode50 lily/acceptance-set.cc:50: accepted_ = scm_cons(item, scm_delete_x (item, accepted_)); On 2018/06/15 02:36:40, Dan Eble wrote: On 2018/06/14 22:53:58, dak wrote: > I'm not overly happy with this kind of O(n^2) behavior. Most of the context > definitions will be done in engraver-init.ly where duplication is not an issue > because it has been taken care of manually. Let me also clarify that scm_delete_x was used in this way in the old Context_def::get_accepted before the default was prepended to the list; what's new in my patch is that it happens as the default child is defined rather than as the definition is consulted (and that it happens when \accepts is defined, which was the focus of my earlier reply). https://codereview.appspot.com/346080043/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: make doc bombs out in MusicXML
David Kastrup writes: > I get the following: > > lilypond-book.py: error: `musicxml2ly --out=- - ' failed (0) > lilypond-book.py: error: The error log is as follows: > musicxml2ly: Reading MusicXML from Standard input ... > musicxml2ly: Converting to LilyPond expressions... > Traceback (most recent call last): > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3297, in > > main() > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3291, in > main > voices = convert(filename, options) > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3168, in > convert > (voices, staff_info) = get_all_voices(parts) > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 2776, in > get_all_voices > voice = musicxml_voice_to_lily_voice(v) > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 2332, in > musicxml_voice_to_lily_voice > for direction in musicxml_direction_to_lily(n): > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 1580, in > musicxml_direction_to_lily > event = musicxml_metronome_to_ly(next_entry, entry) > File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 1490, in > musicxml_metronome_to_ly > ev.set_text(text_event.get_text().strip()) > AttributeError: TempoMark instance has no attribute 'set_text' > /tmp/build-lilypond-autobuild/scripts/build/out/texi2omf --format pdf > --location > /usr/local/share/doc/lilypond/html/input/regression/musicxml/collated-files.pdf > --version 2.21.0 out-www/collated-files.texi > > out-www/collated-files.pdf.omf > Traceback (most recent call last): > File "/tmp/build-lilypond-autobuild/scripts/build/out/texi2omf", line 73, > in > texi = open (infile).read () > IOError: [Errno 2] No such file or directory: 'out-www/collated-files.texi' > /tmp/lilypond-autobuild/./make/ly-rules.make:43: recipe for target > 'out-www/collated-files.pdf.omf' failed > make[4]: *** [out-www/collated-files.pdf.omf] Error 1 > > This is standard lilypond-patchy-staging on my side so I am somewhat > puzzled why with this error in place (which appears to point to an > inconsistency in musicxml) the current state of master could have > included this patch. Maybe my version of Python is less lenient about > undefined members or something? > > At any rate, I lean towards reverting the work of Alexander Myltsev > until this has been cleared up. > > Opinions? Ugh. Looks like the code does add such a function. Can it be that "make doc" uses the tested version of musicxml2y only partly and reverts to scraps of the installed version for some reason? Or something like that? -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
make doc bombs out in MusicXML
I get the following: lilypond-book.py: error: `musicxml2ly --out=- - ' failed (0) lilypond-book.py: error: The error log is as follows: musicxml2ly: Reading MusicXML from Standard input ... musicxml2ly: Converting to LilyPond expressions... Traceback (most recent call last): File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3297, in main() File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3291, in main voices = convert(filename, options) File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 3168, in convert (voices, staff_info) = get_all_voices(parts) File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 2776, in get_all_voices voice = musicxml_voice_to_lily_voice(v) File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 2332, in musicxml_voice_to_lily_voice for direction in musicxml_direction_to_lily(n): File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 1580, in musicxml_direction_to_lily event = musicxml_metronome_to_ly(next_entry, entry) File "/tmp/build-lilypond-autobuild/scripts/out/musicxml2ly", line 1490, in musicxml_metronome_to_ly ev.set_text(text_event.get_text().strip()) AttributeError: TempoMark instance has no attribute 'set_text' /tmp/build-lilypond-autobuild/scripts/build/out/texi2omf --format pdf --location /usr/local/share/doc/lilypond/html/input/regression/musicxml/collated-files.pdf --version 2.21.0 out-www/collated-files.texi > out-www/collated-files.pdf.omf Traceback (most recent call last): File "/tmp/build-lilypond-autobuild/scripts/build/out/texi2omf", line 73, in texi = open (infile).read () IOError: [Errno 2] No such file or directory: 'out-www/collated-files.texi' /tmp/lilypond-autobuild/./make/ly-rules.make:43: recipe for target 'out-www/collated-files.pdf.omf' failed make[4]: *** [out-www/collated-files.pdf.omf] Error 1 This is standard lilypond-patchy-staging on my side so I am somewhat puzzled why with this error in place (which appears to point to an inconsistency in musicxml) the current state of master could have included this patch. Maybe my version of Python is less lenient about undefined members or something? At any rate, I lean towards reverting the work of Alexander Myltsev until this has been cleared up. Opinions? -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: musicxml2ly: handle hidden time signatures; support text+bpm \tempo marks. (issue 344000043 by a.mylt...@gmail.com)
On 2018/06/13 14:38:23, lilypond-pkx wrote: On 2018/06/04 10:51:25, a.myltsev wrote: > Removed the 'test' commits, leaving only changes to Python files. Patch counted down - please push. Alex if you do not have commit access can you attach a git-formatted patch (re-based against current master) and I can push it for you - attach it to the tracker, I will see it - https://sourceforge.net/p/testlilyissues/issues/5333/ author Alexander Myltsev Wed, 27 Apr 2016 16:04:43 +0100 (18:04 +0300) committer James Lowe Sat, 16 Jun 2018 10:58:59 +0100 (10:58 +0100) commit d751f5fd70d1c4de9878dceb81bda42e9a500fb7 author Alexander Myltsev Thu, 2 Jun 2016 09:19:07 +0100 (11:19 +0300) committer James Lowe Sat, 16 Jun 2018 10:59:08 +0100 (10:59 +0100) commit 7b07440da921d979ab492fd284b6198152a8020c Many thanks Alexander. https://codereview.appspot.com/34443/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
PATCHES - Countdown for June 16th
Hello, Here is the current patch countdown list. The next countdown will be on June 19th. A quick synopsis of all patches currently in the review process can be found here: http://philholmes.net/lilypond/allura/ Push: 5340 Simplify Spacing_spanner::get_columns - Dan Eble https://sourceforge.net/p/testlilyissues/issues/5340 http://codereview.appspot.com/348940044 5338 Fix out-of-sync LilyScriptEncoding / ps script defs - Knut Petersen https://sourceforge.net/p/testlilyissues/issues/5338 http://codereview.appspot.com/347870043 5334 Use system* instead of system when invoking browser - James Lowe https://sourceforge.net/p/testlilyissues/issues/5334 http://codereview.appspot.com/336240043 5333 musicxml2ly: hidden timesigs and tempo marks with text. - Alexander Myltsev https://sourceforge.net/p/testlilyissues/issues/5333 http://codereview.appspot.com/34443 Countdown: 5346 Fix GC issue in skyline rotations - David Kastrup https://sourceforge.net/p/testlilyissues/issues/5346 http://codereview.appspot.com/344960043 5343 Remove Moment::as_scheme - David Kastrup https://sourceforge.net/p/testlilyissues/issues/5343 http://codereview.appspot.com/346070043 5341 Urgent corrections to stencil-integral.cc (skylines) - Torsten Hammerle https://sourceforge.net/p/testlilyissues/issues/5341 http://codereview.appspot.com/341350043 Review: No patches in Review at this time. New: No new patches at this time Regards James ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
