anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6510: URL in the footnote will cause the `CJK' environment to terminate

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33382 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2010-02-09 14:01:21 +00:00
parent fef95cecbd
commit e4cff09722
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/output_latex.cpp
View File

@ -319,6 +319,15 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
OutputParams runparams = runparams_in;
runparams.isLastPar = nextpit == paragraphs.end();
bool const maintext = text.isMainText();
// we are at the beginning of an inset and CJK is already open;
// we count inheritation levels to get the inset nesting right.
if (pit == paragraphs.begin() && !maintext
&& (cjk_inherited_ > 0 || open_encoding_ == CJK)) {
cjk_inherited_ += 1;
open_encoding_ = none;
}
if (runparams.verbatim) {
int const dist = distance(paragraphs.begin(), pit);
Font const outerfont = text.outerFont(dist);
@ -341,15 +350,6 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
runparams.moving_arg |= style.needprotect;
bool const maintext = text.isMainText();
// we are at the beginning of an inset and CJK is already open;
// we count inheritation levels to get the inset nesting right.
if (pit == paragraphs.begin() && !maintext
&& (cjk_inherited_ > 0 || open_encoding_ == CJK)) {
cjk_inherited_ += 1;
open_encoding_ = none;
}
// This paragraph's language
Language const * const par_language = pit->getParLanguage(bparams);
// The document's language