Dan Eble [Mon, 11 May 2015 02:02:34 +0000 (22:02 -0400)]
Issue 4385: Part_combine_iterator: remove residue related to marks
This could have been removed when the generation of mark events was
moved from C++ to Scheme in aae8f9ee8f62e8a57f4f60a60e639a040571f37b,
but it went unnoticed at that time.
On Cygwin environment,
Guile's uname returns the strings of "CYGWIN_NT-6.3" etc.
It contains unnecessary strings for the platform identification,
such as Windows version.
Therefore, to remove them to return the only "cygwin".
David Kastrup [Sun, 10 May 2015 14:03:42 +0000 (16:03 +0200)]
Issue 4372: convert-ly misses some bflat -> b-flat
In python/convert-rules.py, using '\b' for note name boundaries turns
out to be too audacious since bflat4 is one word. A proper solution
would be to match the variable wordsyntax and let the match expression
use a replacement function that triggers on the right words. However,
such a large number of matches would be expensive. So instead we are
using positive lookahead and lookbehind expressions to get reasonably
good matches.
David Kastrup [Wed, 6 May 2015 22:30:18 +0000 (00:30 +0200)]
Issue 4376: Add LY_ASSERT_DERIVED_SMOB macro
When LY_ASSERT_SMOB is called with a class that is actually derived from
some smobified base class providing is_smob and unsmob, the resulting
check and error message are inaccurate. This patch uses dynamic_cast to
implement a separate LY_ASSERT_DERIVED_SMOB attaining sensible behavior
in that case. When no derivation is involved, the performance impact is
minimal.
David Kastrup [Fri, 8 May 2015 09:04:01 +0000 (11:04 +0200)]
Issue 4378: Rewrite Protected_scm for static lifetime requirements
The use of Protected_scm is required where the per-instance object
marking mechanisms don't work. This patch changes its semantics to
cater exclusively for the use case of permanent variable life time (as
opposed to permanent value life time). It no longer employs the
reversible scm_gc_protect_object but rather uses scm_permanent_object
for protecting one cons cell as its principal storage mechanism.
It is also ensured that construction/destruction (which happen at very
early/late phases of program execution) do not require a working memory
subsystem.
David Kastrup [Thu, 7 May 2015 19:22:20 +0000 (21:22 +0200)]
Issue 4377: Run a script for using derived_unsmob where obvious
Script is:
matched="[^()]*"
for i in 1 2 3 4 5
do
matched="\\(($matched)\\|[^()]\\)*"
done
filelist="$(git grep -l '\<dynamic_cast[^>]*> ([_a-zA-Z]*::unsmob\>')"
typelist="$(sed -n 's/^.*\<dynamic_cast\s*<\([_a-zA-Z]\+\)\s*\*> (\([_a-zA-Z]*\)::unsmob\>.*$/\1/p' $filelist | sort -u )"
for typ in $typelist
do
# crazy: we have unsmob definitions that are not even used
if git grep -q "$typ::unsmob" || git grep -q "\\<$typ"'\s*\*\s*unsmob\s*(SCM'
then
echo "There already is $typ::unsmob"
sed -i '/unsmob (SCM/,/;/!s/\<dynamic_cast\s*<\('"$typ"'\)\s*\*> (\([_a-zA-Z]*\)::unsmob\s*(\('"$matched"'\))\s*)/\1::unsmob (\3)/g' $filelist
else
sed -i 's/\<dynamic_cast\s*<\('"$typ"'\)\s*\*> (\([_a-zA-Z]*\)::unsmob\s*(\('"$matched"'\))\s*)/derived_unsmob<\1> (\3)/g' $filelist
fi
done
The awkward bit at the start of the script is for matching matched
parentheses. This replaces the construct
dynamic_cast<T *>(xxx::unsmob (yyy))
with
derived_unsmob<T> (yyy)
where appropriate. If T::unsmob already exists, it is used
instead (apart from inside of its own definition, of course).
James Lowe [Thu, 19 Mar 2015 13:14:19 +0000 (13:14 +0000)]
Doc: NR section 3.5.x MIDI file creation tidy up
Issue 2877
I feel we're constantly updating a
'messy' chapter that doesn't really
follow many of the CG guidelines and
so could be better organized.
Apart from some @cindex or @seealso
references no new information and
nothing technical has been removed
but the information has been
reorganized so that it is (I hope)
grouped more logically.
Some snippets have been created from
the original text as they were
inappropriate for the NR.
The @lilypond examples have been simplified
and turned into @examples instead as the
engraving output is largely irrelevant
in a section about MIDI; saving space.
Trevor Daniels [Fri, 1 May 2015 21:56:47 +0000 (22:56 +0100)]
Issue 3687 (part 2): Amend docs to use \compressMMRests
Amend the examples in the LM and NR to use the \compressMMRests
music function rather than the predefs \compressFullBarRests and
\expandFullBarRests to avoid advocating the use of techniques
which may have undesirable side effects.
Issue 3687 (part 1): Provide a compress MM function for MM rests only
Multi-measure rests were previously compressed (i.e. all bars
following the first were removed) by using the \compressFullBarRests
predef. This simply turned on 'skipBars, which causes bar lines at
the ends of bars which contain either no rhythmic event or contain
a rhythmic event with a duration extending beyond the bar to be removed.
Such bars are generated by notes with durations longer than a bar,
like a1*3, or by shorter notes which extend beyond the bar.
This patch provides a function which also uses 'skipBars, but with
a filter so that 'skipBars is activated only when an actual MM rest
is encountered and deactivated by the first following rhythmic event.
Carl Sorensen [Sat, 25 Apr 2015 03:07:51 +0000 (21:07 -0600)]
Fix issue 4355 -- broken beam subdivision
When beams are subdivided, the number of beams joining the subdivisions
should match the length of the subdivision. Previously, the subdivisions
were joined by a single beam.
David Kastrup [Thu, 30 Apr 2015 18:48:09 +0000 (20:48 +0200)]
Issue 4360: Reorganize smob initialization to make it more reliable
This change is a nuisance in that it requires an explicit call to
ADD_SMOB_INIT for each Scheme-related class.
However, this setup guarantees that at the point Scheme execution
commences, all predicates of the likes of "ly:grob?" will be present.
It also guarantees that if a particular type should seem required during
_other_ initializations that happen to depend on the type and get
executed earlier, it will be provided early.
David Kastrup [Fri, 1 May 2015 22:35:35 +0000 (00:35 +0200)]
Issue 4364: Allow ImageMagick's compare to exit with status 1
Apparently Ubuntu 15.04 has a version of "compare" that cannot be easily
persuaded to return anything but exit status 1 (which indicates
dissimilar images but no actual error condition) so we allow this in
script/build/output-distance.py in order to keep "make check" from
failing.
This patch is somewhat artless but does the trick.
David Kastrup [Mon, 20 Apr 2015 12:41:15 +0000 (14:41 +0200)]
Issue 4351/1: Rename Engraver_void_function_engraver_grob_info to Translator::Grob_info_callback
This is somewhat more descriptive. Since the general dispatcher
management is done in Translator rather than Engraver, making this
typedef local to Engraver instead would really complicate things.
Issue 3799: New satb.ly built-in template and template framework
Add kits as aids for providing built-in templates ("tkits")
Replace the satb.ly template with one built from the tkits, which
corrects some errors and extends the facilities:
- fixes issue 4192
- \lyricsmode should be used; never \lyricsto
- Women and Men one-voice staves added
- Two-voice staves called MenDivided, WomenDivided
- Soprano and Tenor music may now be omitted without error
- midi instruments may be specified
- midi channel mapping is by instrument
- midi instruments are by voice, not staff
- regression tests added
- documentation minimally updated
Doc: Issue 4349: Clarify where changes to beatStructure should be placed
Make it clear that changes to beatStructure and baseMoment
apply only to the time signature currently in force, and
hence that those changes must come immediately after a
new \time command, not before it.
Finally, I replaced (!cached) with (!SCM_UNPACK (cached)) in
lily-guile-macros.hh, as has been suggested once by David.
Please note that this commit does not handle some situations
I’m less comfortable with (namely those involving scm_c_memq,
scm_assq or scm_hashq_get_handle), and some scm_*_p checks
for which there isn’t a ly_is_* replacement yet (to wit,
scm_hash_table_p, scm_promise_p, and scm_variable_bound_p).
Those should be dealt with later (another patch is in the works).