2004-03-01 Alfredo Braunstein <abraunst@lyx.org>
- * lyxtext.h:
- * text.C:
- * text2.C:
- * rowpainter.C:
- * BufferView_pimpl.C: rename textwidth -> maxwidth,
- prepareToPrint -> computeRowMetrics and remove textWidth accessor.
+ * text.C (rowBreakPoint): fix breaking before displayed insets
2004-03-01 André Pönitz <poenitz@gmx.net>
* text2.C:
* text3.C: adjust
+2004-03-01 Alfredo Braunstein <abraunst@lyx.org>
+
+ * lyxtext.h:
+ * text.C:
+ * text2.C:
+ * rowpainter.C:
+ * BufferView_pimpl.C: rename textwidth -> maxwidth,
+ prepareToPrint -> computeRowMetrics and remove textWidth accessor.
+
2004-03-01 Alfredo Braunstein <abraunst@lyx.org>
* Bidi.[Ch] (computeTables): const correctness
pos_type point = end;
pos_type i = pos;
for ( ; i < end; ++i, ++fi) {
- if (pit->isNewline(i)) {
- point = i + 1;
- break;
- }
- // Break before...
- if (i + 1 < end) {
- if (pit->isInset(i + 1) && pit->getInset(i + 1)->display()) {
- point = i + 1;
- break;
- }
- // ...and after.
- if (pit->isInset(i) && pit->getInset(i)->display()) {
- point = i + 1;
- break;
- }
- }
-
char const c = pit->getChar(i);
{
break;
}
+ if (pit->isNewline(i)) {
+ point = i + 1;
+ break;
+ }
+ // Break before...
+ if (i + 1 < end) {
+ if (pit->isInset(i + 1) && pit->getInset(i + 1)->display()) {
+ point = i + 1;
+ break;
+ }
+ // ...and after.
+ if (pit->isInset(i) && pit->getInset(i)->display()) {
+ point = i + 1;
+ break;
+ }
+ }
+
if (!pit->isInset(i) || pit->getInset(i)->isChar()) {
// some insets are line separators too
if (pit->isLineSeparator(i)) {
}
}
- if (i == end && x < width) {
- // maybe found one, but the par is short enough.
+ // maybe found one, but the par is short enough.
+ if (i == end && x < width)
point = end;
- }
// manual labels cannot be broken in LaTeX. But we
// want to make our on-screen rendering of footnotes