]> git.donarmstrong.com Git - lilypond.git/commit - lily/paper-column.cc
Fix #1490: Allow page labels on loose columns.
authorNeil Puttock <n.puttock@gmail.com>
Mon, 21 Feb 2011 22:53:26 +0000 (22:53 +0000)
committerNeil Puttock <n.puttock@gmail.com>
Mon, 21 Feb 2011 22:53:26 +0000 (22:53 +0000)
commit528fe05abc9baab629c789428bd323f00a87f82d
treea0c2fad9b62a327d3e8a07ef04426e49b800148b
parent9492212f7b9135d32a1b2931021d79cca96b813d
Fix #1490: Allow page labels on loose columns.

Don't discard labels set on columns which are currently pruned or fall on
an empty barline.

* input/regression (page-label-loose-column.ly)

  new regtest, checks both unbreakable mid-line and empty barline labels

* lily/include/system.hh:

  add collect_labels ()

* lily/paper-column.cc (is_used):

  return true if 'labels is set

* lily/spacing-determine-loose-columns.cc (prune_loose_columns):

  set 'maybe-loose on columns which only contain page-labels

* lily/system.cc (break_into_pieces, collect_labels):

  collect labels from loose columns
  move label collection to separate method
input/regression/page-label-loose-column.ly [new file with mode: 0644]
lily/include/system.hh
lily/paper-column.cc
lily/spacing-determine-loose-columns.cc
lily/system.cc