From a9021ae6164c59e78c9488cb9c37d7cbfbf3cf7c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 18 Jan 2003 23:15:57 +0000 Subject: [PATCH] (get_line): backport off by two fix from development release. --- ChangeLog | 5 +++++ Documentation/user/refman.itely | 2 +- lily/source-file.cc | 13 ++++++++++++- po/da.po | 7 +++---- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 374fb5dca2..ecef1aea30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-19 Han-Wen Nienhuys + + * lily/source-file.cc (get_line): backport off by two fix from + development release. + 2002-11-21 Mats Bengtsson * lily/volta-engraver.cc (process_acknowledged_grobs): diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 38d1b90e40..e7a6136600 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -3420,7 +3420,7 @@ at the beginning of the next line, opposite to what you want for the fermata. This can be corrected by the following property setting @example \property Score.RehearsalMark \override - #'visibility-lambda = #begin-of-line-invisible + #'break-visibility = #begin-of-line-invisible @end example @cindex fermatas diff --git a/lily/source-file.cc b/lily/source-file.cc index 23cf17cf7c..85ed8ca64b 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -262,15 +262,26 @@ Source_file::get_line (char const* pos_str0) const if (!in_b (pos_str0)) return 0; + if (!newline_locations_.size()) + return 1; + + int lo=0; int hi = newline_locations_.size(); + if (newline_locations_[lo] > pos_str0) + return 1; + if (newline_locations_[hi-1] < pos_str0) + return hi; + binary_search_bounds (newline_locations_, pos_str0, Link_array::default_compare, &lo, &hi); - return lo; + if (*pos_str0 == '\n') + lo --; + return lo + 2; } int diff --git a/po/da.po b/po/da.po index 2e737d14df..bc35d60622 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.6.0\n" "POT-Creation-Date: 2002-08-18 17:05+0200\n" -"PO-Revision-Date: 2002-09-07 21:00+0200\n" +"PO-Revision-Date: 2003-01-17 21:00+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "K #: ly2dvi.py:118 msgid "Distributed under terms of the GNU General Public License. It comes with NO WARRANTY." -msgstr "" +msgstr "Distribueret under betingelserne i GNU Generelle Offentlige Licens (GLP). Den leveres UDEN NOGEN GARANTIER." #: ly2dvi.py:125 midi2ly.py:148 mup2ly.py:143 update-lily.py:137 input.cc:87 msgid "warning: " @@ -274,9 +274,8 @@ msgid "ALT[:MINOR]" msgstr "" #: midi2ly.py:99 -#, fuzzy msgid "set key: ALT=+sharps|-flats; MINOR=1" -msgstr "sæt toneart: TONE +forhøjelser/-sænkninger; :1 mol" +msgstr "sæt toneart: TONE=+forhøjelser/-sænkninger; mol=1" #: midi2ly.py:101 msgid "quantise note starts on DUR" -- 2.39.5