Jürgen Spitzmüller schrieb:
We should not wait too long with 1.6.1, since 1.6.0 has introduced some major
issues (as expected). In general, I'd like to concentrate on ironing out the
critical and major bugs (quite some work has already been done) and make 1.6.1
a bugfix-release only.
My personal patch list is as follows:
* rcs.txt - Addresses bug 5389
* mathed.txt - Fix some compiler warnings
* paragraph.txt - Fix a compiler warning
At least rcs.txt fixes a major bug (crash in from_ascii()).
I suggest to apply it to trunk and branch.
Stephan
-------------------------------------------------------------------------------
Index: src/VCBackend.cpp
===================================================================
--- src/VCBackend.cpp (revision 27660)
+++ src/VCBackend.cpp (working copy)
@@ -52,7 +52,7 @@
frontend::Alert::error(_("Revision control error."),
bformat(_("Some problem occured while running the
command:\n"
"'%1$s'."),
- from_ascii(cmd)));
+ from_utf8(cmd)));
return ret;
}
@@ -534,7 +534,7 @@
bformat(_("Error when updating from repository.\n"
"You have to manually resolve the conflicts
NOW!\n'%1$s'.\n\n"
"After pressing OK, LyX will try to reopen
resolved document."),
- from_ascii(res)));
+ from_utf8(res)));
tmpf.erase();
return "SVN: " + log;
}
Index: src/mathed/InsetMathHull.cpp
===================================================================
--- src/mathed/InsetMathHull.cpp (revision 27660)
+++ src/mathed/InsetMathHull.cpp (working copy)
@@ -1328,14 +1328,15 @@
case LFUN_MATH_NUMBER_TOGGLE:
// FIXME: what is the right test, this or the one of
// LABEL_INSERT?
- status.setEnabled(display());
+ status.setEnabled(display() != Inline);
status.setOnOff(numberedType());
return true;
case LFUN_MATH_NUMBER_LINE_TOGGLE: {
// FIXME: what is the right test, this or the one of
// LABEL_INSERT?
- bool const enable = (type_ == hullMultline) ?
- (nrows() - 1 == cur.row()) : display();
+ bool const enable = (type_ == hullMultline)
+ ? (nrows() - 1 == cur.row())
+ : display() != Inline;
row_type const r = (type_ == hullMultline) ? nrows() - 1 :
cur.row();
status.setEnabled(enable);
status.setOnOff(numbered(r));
Index: src/Paragraph.cpp
===================================================================
--- src/Paragraph.cpp (revision 27660)
+++ src/Paragraph.cpp (working copy)
@@ -1281,7 +1281,7 @@
d->text_.append(s);
// FIXME: Optimize this!
- for (pos_type i = oldsize; i != newsize; ++i) {
+ for (size_t i = oldsize; i != newsize; ++i) {
// track change
d->changes_.insert(change, i);
}
