mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-20 06:49:56 +00:00
ws fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8464 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c3ed8dc263
commit
f3a750ab93
46
src/text.C
46
src/text.C
@ -1084,32 +1084,32 @@ void LyXText::prepareToPrint(ParagraphList::iterator pit, Row & row) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch (align) {
|
switch (align) {
|
||||||
case LYX_ALIGN_BLOCK: {
|
case LYX_ALIGN_BLOCK: {
|
||||||
int const ns = numberOfSeparators(*pit, row);
|
int const ns = numberOfSeparators(*pit, row);
|
||||||
bool disp_inset = false;
|
bool disp_inset = false;
|
||||||
if (row.endpos() < pit->size()) {
|
if (row.endpos() < pit->size()) {
|
||||||
InsetBase * in = pit->getInset(row.endpos());
|
InsetBase * in = pit->getInset(row.endpos());
|
||||||
if (in)
|
if (in)
|
||||||
disp_inset = in->display();
|
disp_inset = in->display();
|
||||||
}
|
|
||||||
// If we have separators, this is not the last row of a
|
|
||||||
// par, does not end in newline, and is not row above a
|
|
||||||
// display inset... then stretch it
|
|
||||||
if (ns
|
|
||||||
&& row.endpos() < pit->size()
|
|
||||||
&& !pit->isNewline(row.endpos() - 1)
|
|
||||||
&& !disp_inset
|
|
||||||
) {
|
|
||||||
fill_separator = w / ns;
|
|
||||||
} else if (is_rtl) {
|
|
||||||
x += w;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
case LYX_ALIGN_RIGHT:
|
// If we have separators, this is not the last row of a
|
||||||
|
// par, does not end in newline, and is not row above a
|
||||||
|
// display inset... then stretch it
|
||||||
|
if (ns
|
||||||
|
&& row.endpos() < pit->size()
|
||||||
|
&& !pit->isNewline(row.endpos() - 1)
|
||||||
|
&& !disp_inset
|
||||||
|
) {
|
||||||
|
fill_separator = w / ns;
|
||||||
|
} else if (is_rtl) {
|
||||||
|
x += w;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case LYX_ALIGN_RIGHT:
|
||||||
x += w;
|
x += w;
|
||||||
break;
|
break;
|
||||||
case LYX_ALIGN_CENTER:
|
case LYX_ALIGN_CENTER:
|
||||||
x += w / 2;
|
x += w / 2;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user