Fix bug 5216

http://bugzilla.lyx.org/show_bug.cgi?id=5216


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27243 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2008-11-03 22:57:51 +00:00
parent a73c6c72dc
commit 33f0bb6ac3

View File

@ -757,16 +757,16 @@ void Paragraph::Private::latexInset(
}
bool close = false;
odocstream::pos_type const len = os.tellp();
odocstringstream ods;
if (inset->forceLTR()
&& running_font.isRightToLeft()
// ERT is an exception, it should be output with no decorations at all
&& inset->lyxCode() != ERT_CODE) {
if (running_font.language()->lang() == "farsi")
os << "\\beginL{}";
ods << "\\beginL{}";
else
os << "\\L{";
ods << "\\L{";
close = true;
}
@ -785,7 +785,7 @@ void Paragraph::Private::latexInset(
if (open_font && inset->noFontChange()) {
bool closeLanguage = arabtex
|| basefont.isRightToLeft() == running_font.isRightToLeft();
unsigned int count = running_font.latexWriteEndChanges(os,
unsigned int count = running_font.latexWriteEndChanges(ods,
bparams, runparams, basefont, basefont, closeLanguage);
column += count;
// if any font properties were closed, update the running_font,
@ -808,7 +808,7 @@ void Paragraph::Private::latexInset(
int tmp;
try {
tmp = inset->latex(os, runparams);
tmp = inset->latex(ods, runparams);
} catch (EncodingException & e) {
// add location information and throw again.
e.par_id = id_;
@ -817,12 +817,14 @@ void Paragraph::Private::latexInset(
}
if (close) {
if (running_font.language()->lang() == "farsi")
os << "\\endL{}";
else
os << '}';
if (running_font.language()->lang() == "farsi")
ods << "\\endL{}";
else
ods << '}';
}
os << ods.str();
if (tmp) {
for (int j = 0; j < tmp; ++j)
texrow.newline();
@ -830,7 +832,7 @@ void Paragraph::Private::latexInset(
texrow.start(owner_->id(), i + 1);
column = 0;
} else {
column += os.tellp() - len;
column += ods.str().size();
}
if (owner_->lookupChange(i).type == Change::DELETED)