Ok, I've tried doing a reasonable collection of what should go into 2.18.1. This does not contain significant documentation patches: the translation team would have no realistic chance to have a go at them _if_ we happen to release 2.18.1 this weekend.
I've rolled a set of patches together that seem reasonably safe and desirable and tried resolving the merge conflicts correctly. Please check whether you agree. There is slightly more involved than just bug fixes here. There is a branch dev/stable-2.18-proposed with the status, and it contains the following as compared to stable/2.18 : commit 536cad5ac3c8518d6ab738e04aad9aee9804e691 Author: David Kastrup <d...@gnu.org> Date: Sat Jan 11 14:08:55 2014 +0100 Issue 3797: Music_wrapper_iterator does not follow original context setting of child We do this by making Music_iterator::get_handle and Music_iterator::set_context virtual and letting Music_wrapper_iterator redirect them to the child iterator. \score { << { { a4 a b b } a a b b } { \absolute { a4 a b b } a a b b } >> } splits off a new Staff after \absolute { a4 a b b }. commit daf7dd75bf8f5927b15fbaae98aec2a1065dcc7b Author: David Kastrup <d...@gnu.org> Date: Fri Jan 10 01:29:40 2014 +0100 Issue 3794: Fix doc string for ly:context-def-lookup commit 429daeb796ba43f1b1fd34e36d78ff32175d1ee0 Author: David Kastrup <d...@gnu.org> Date: Sun Jan 5 01:17:49 2014 +0100 Issue 3776: Doc: simplify \score description, matching its current syntax commit 603e8ca7adf1fa51c4ec63337d63bb9e46dd5670 Author: David Kastrup <d...@gnu.org> Date: Sun Jan 5 18:48:41 2014 +0100 Issue 3780: Allow use of Scheme expressions as chord constituents That's actually rather desirable for using #{ ... #} in connection with the make-relative macro. commit ee37ea57f96564d863ff420b0b951491f083fe60 Author: Carl Sorensen <carl.d.soren...@gmail.com> Date: Sat Jan 11 19:15:19 2014 -0700 Change default fretboard for b:7 (Issue 3791) commit d127d333482871aea0cfec73d08994f5bf399d1f Author: David Kastrup <d...@gnu.org> Date: Wed Jan 1 21:19:42 2014 +0100 Issue 3770: Use value->lily-string for -ddebug-parser commit 024cbc651e4e64a5a0476e0da92c92f2a70e6a9f Author: David Kastrup <d...@gnu.org> Date: Wed Jan 1 20:54:15 2014 +0100 Provide value->lily-string function commit c45018bcab72634c34e43c7e510f270956fc1174 Author: David Kastrup <d...@gnu.org> Date: Thu Jan 2 00:57:15 2014 +0100 Issue 3769: Lexer/Parser: Don't package location data in SCM_TOKEN semantic value As the location data is available as the location value in the parser anyway, there is no point in packaging it into the semantic value. Among other things, this leads to a cleaner display when using -ddebug-parser, and to better understandable code. commit f8c25dc32c249eda36f71463967e88d79d88556d Author: Keith OHara <k-ohara5...@oco.net> Date: Tue Dec 17 17:20:22 2013 -0800 note-spacing: let compressibility be uniform; issue 3304 Comments implied that half the width of accidentals, etc., was added to the ideal spacing between notes, but in fact only compressibility was affected. The non-uniform compressibility caused note-spacing to become non-uniform when the lines were compressed. For example A sequence {\stemUp a a d a] would have the head of the D tuck under the preceding A. This commit keeps spacing uniform on compressed lines until objects come within padding of each other. commit 440c434eaa28441d7e4b5c589a01f3036db7f0df Author: Keith OHara <k-ohara5...@oco.net> Date: Tue Dec 17 16:41:51 2013 -0800 note-spacing: stretch somewhat uniformly Start with a basic spring based on the note duration, and apply optical corrections to that. This results in more consistent springs thus more uniform stretching in polyphonic situations. commit d862d4d171387ef5bc7d35b990f942d1395342f9 Author: Keith OHara <k-ohara5...@oco.net> Date: Tue Dec 17 14:59:31 2013 -0800 springs: comment and typo commit 93b7d2447f2844428c8f1c727f724431d56aead9 Author: Keith OHara <k-ohara5...@oco.net> Date: Tue Dec 17 14:58:29 2013 -0800 spacing-options: clarify documentation commit 0c193995d884c167d6df57440d229b79be1711c4 Author: Keith OHara <k-ohara5...@oco.net> Date: Sat Dec 28 13:40:45 2013 -0800 ledger-lines: horizontal space only when present commit 478d273c85706814744e4193b28be64ec2e6d4fb Author: Trevor Daniels <t.dani...@treda.co.uk> Date: Fri Dec 27 23:29:51 2013 +0000 Issue 3635: Doc LM: Improve the explanation of 'force-hshift Add an explanation of the 'horizontal-shift property Expand the explanation of the 'force-hshift property Make the example of using the 'force-hshift property more transparently clear. commit 02b7647f225c62a788740494fa564b0806b21985 Author: David Kastrup <d...@gnu.org> Date: Sat Dec 14 22:33:53 2013 +0100 Issue 3728: Allow score and book identifiers at top level, and score identifiers in book(part)s Instead of xxx = \score { ... } yyy = \book { ... } \score { \xxx } \book { \yyy } you can now just write xxx = \score { ... } yyy = \book { ... } \xxx \yyy Book and bookparts at top level are distinguished by virtue of only books having a \paper block. commit 923b0cb91606f4faece147b3166045529c164d9f Author: David Kastrup <d...@gnu.org> Date: Sat Dec 14 22:29:12 2013 +0100 Regularize score handling (origin and copying) Scores get their origin set when score_body is called, and when encountered in \xxx and constructs, are properly copied. commit d5aee802bf252155f4c31ef8ae6bc0cb979ccf20 Author: David Kastrup <d...@gnu.org> Date: Sat Dec 14 20:59:30 2013 +0100 Issue 3727: Allow header blocks and output definitions in \score to precede music This addresses a frequent complaint of users. commit 691628e26e08417c1f50365ee8d8f48dfcb3cb7f Author: Janek Warchoł <janek.lilyp...@gmail.com> Date: Tue Jun 19 12:02:01 2012 +0200 XY-extent: more accurate docstring commit 21142318024c3abac5a13adaf32233cc741683cb Author: David Kastrup <d...@gnu.org> Date: Tue Apr 23 17:02:47 2013 +0200 Add Changes entry for -dstrokeadjust and "Usage" entry. commit 9a0d1e16702de478b714eeadbc9db808d2531194 Author: David Kastrup <d...@gnu.org> Date: Tue Apr 23 16:49:19 2013 +0200 Implement option -dstrokeadjust in order to get stroked stems and strokeadjustment This makes the stroke drawing primitives for long rounded rectangles dependent on the setting of currentstrokeadjust. As a result, low-resolution bitmap devices (up to 150 dpi or so) will get stroke adjustment applied automatically. The option needs to get invoked explicitly to get stroke adjustment for PDF, giving a large file size increase and markedly better previews on a number of PDF previewers. commit 4cc50300bd01f7890f93e99480fdf1661724b5b8 Author: David Kastrup <d...@gnu.org> Date: Thu Apr 11 17:27:14 2013 +0200 Issue 2658: Be serious about setstrokeadjust in PostScript primitives This particularly concerns draw_round_box which is used for drawing lines with a rounded ending. If the width/height ratio or its inverse exceeds 2, the box is considered to be a "line". In this case, first a clipping path is established representing the whole shape and extended widely in the area of the "main stroke". The reason for this extension is to avoid both clip area and stroke competing for the outline. While this is not a problem for the PostScript or PDF rendering model, the Cairo bitmap rendering library employs Porter-Duff compositing for antialiasing amounting to "cheap man's antialiasing" not requiring a higher rendering resolution but relying on edges affecting a single pixel to be independent. Porter-Duff requires us not to have multiple parallel strokes or clip areas if we want to avoid wrong sub-pixel grayness levels (and consequently lines appearing too thick or thin) in Cairo-based previewers like Evince. After establishing the clip area, a stroke is drawn through. This stroke may (at the PostScript device's discretion) employ strokeadjustment further correcting the apparent thickness. Ghostscript employs stroke adjustment when rendering at a resolution below 150dpi. Stroke adjustment does not pass into PDF, however, when ps2pdf runs. Ghostscript performs sub-pixel rendering for antialiasing which reduces the amount of discontinuities possibly caused by joining stroke-adjusted shapes with full shapes. It turns out that sharper contours can be achieved by using strokepath and fill instead of a plain stroke. However, the resulting crisper stems tend to combine worse with beams, so this approach has not been pursued. commit 0d62c44ca82a0c87715de89f1d36e30c39f8d6da Author: David Kastrup <d...@gnu.org> Date: Thu Apr 18 21:39:50 2013 +0200 Don't meddle with Ghostscript's choice of currentstrokeadjust It should be appropriate for device and resolution by default. commit 4eb203c935aed1bbc148372cf65d63a4c18d82d0 Author: David Kastrup <d...@gnu.org> Date: Thu Apr 11 17:22:43 2013 +0200 Make stroke_and_fill? PostScript operator that fills conditionally commit a92ed1c47447c7eb9b0a7dd03eec5c71aaed1381 Author: David Kastrup <d...@gnu.org> Date: Thu Apr 11 12:01:40 2013 +0200 Make music-drawing-routines.ps require PostScript 2.0 There is no point having conditional code around setstrokeadjust and its ilk any more. commit 86300f89e34b5e59c794312e43425cf9d0444e19 Author: Keith OHara <k-ohara5...@oco.net> Date: Thu Nov 28 16:14:29 2013 -0800 hairpin: start at left edge of a rest commit 692420380703b816a7b41aecde55418fefbace06 Author: David Kastrup <d...@gnu.org> Date: Wed Dec 4 10:00:38 2013 +0100 Implement event-chord-reduce for reducing chords to single notes commit eb9386f47dc3726f169fe49dea7a67b0cf494006 Author: David Kastrup <d...@gnu.org> Date: Sun Dec 22 10:33:31 2013 +0100 Issue 3746: Fix unfold-repeats-fully with alternatives When fewer alternatives than repeats are given, the _first_ alternative needs to get reused (the previous code wrongly used the last one). commit 7b0580f606ad7158c7615483e8f8488af58a6331 Author: David Kastrup <d...@gnu.org> Date: Thu Nov 28 17:25:11 2013 +0100 Add unfold-repeats-fully function which will expand repeats in the data commit 2bd4733afa19c43d2e967bc1c228b63ab89803e2 Author: Keith OHara <k-ohara5...@oco.net> Date: Fri Nov 22 19:50:26 2013 -0800 define-grobs.scm: use a property for TrillPitch offset; issue 3465 commit 55aa882b7ef5afc63ce456450d1f910063655506 Author: Keith OHara <k-ohara5...@oco.net> Date: Fri Nov 22 20:46:49 2013 -0800 page-breaking: allow ragged pages to be compressed commit 77532340587d13af801da118688210d8183911d1 Author: David Kastrup <d...@gnu.org> Date: Sat Nov 16 18:25:03 2013 +0100 Issue 3666: Format error message for argument errors more nicely Actually, using display-lily-music here would be nicer, but it does not cater for anything but music automatically like music->make-music does. commit f940442ecf0e5485c24ea3bf3d6b1ad660703f6a Author: Keith OHara <k-ohara5...@oco.net> Date: Tue Nov 19 16:46:40 2013 -0800 pge-breaking: do not try to fill ragged-pages; issue 3341 commit 9658a9f294603f4918bef6a76441f1f38ed73511 Author: Keith OHara <k-ohara5...@oco.net> Date: Wed Nov 13 13:47:28 2013 -0800 page-breaking: keep the degree of stretching in Line_details; issue 3341 The prioritization of cache_line_details() needs this information to recognize the best configurations. commit e96a0230c940b7c38fb5dbc000231cde71e06d3b Author: David Kastrup <d...@gnu.org> Date: Thu Nov 14 14:26:23 2013 +0100 Let copy-repeat-chord return the copy target for efficiency -- David Kastrup _______________________________________________ bug-lilypond mailing list bug-lilypond@gnu.org https://lists.gnu.org/mailman/listinfo/bug-lilypond