Fix bug #7914: Freeze on docbook export of lists and bibliography

The LATEX_LIST_ENVIRONMENT and LATEX_BIB_ENVIRONMENT type paragraphs are
not yet implemented in DocBook export. However, we need to actively skip
these paragraphs in order not to end up in an endless loop.

(cherry picked from commit fa9bd04ea4)
This commit is contained in:
Vincent van Ravesteijn 2012-05-02 15:34:56 +02:00
parent 2e771bf78d
commit 3a53a52b1c
2 changed files with 13 additions and 2 deletions

View File

@ -295,7 +295,11 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
send = searchParagraph(par, pend);
par = makeParagraph(buf, os, runparams, text, par,send);
break;
default:
case LATEX_BIB_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
// FIXME This means that we are just skipping any paragraph that
// isn't implemented above.
++par;
break;
}
}
@ -349,7 +353,11 @@ void docbookParagraphs(Text const & text,
send = searchParagraph(par, pend);
par = makeParagraph(buf, os, runparams, text, par,send);
break;
default:
case LATEX_BIB_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
// FIXME This means that we are just skipping any paragraph that
// isn't implemented above.
++par;
break;
}
// makeEnvironment may process more than one paragraphs and bypass pend

View File

@ -75,6 +75,9 @@ What's new
* DOCUMENT INPUT/OUTPUT
- Fixed an infinite loop when exporting a file with list
or bibliography environments to DocBook (bug 7914).
- Fixed reading the bounding box from EPS figures with negative
values (bug 8114).