anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix another potentially infinite loop.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29980 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-06-06 01:56:46 +00:00
parent 9fd3c8e9a4
commit 924119797e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/output_xhtml.cpp
View File

@ -241,6 +241,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
case LATEX_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT: {
// FIXME Factor this out.
// There are two possiblities in this case.
// One is that we are still in the environment in which we
// started---which we will be if the depth is the same.
@ -257,7 +258,9 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
if (label_tag_opened)
closeLabelTag(os, cstyle);
os << '\n';
} else if (style.latextype == LATEX_ENVIRONMENT
}
// FIXME Why did I put that first condition??
else if (style.latextype == LATEX_ENVIRONMENT
&& style.labeltype != LABEL_NO_LABEL) {
bool const label_tag_opened = openLabelTag(os, cstyle);
os << pbegin->expandLabel(style, buf.params(), false);
@ -300,6 +303,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
// FIXME
case LATEX_BIB_ENVIRONMENT:
case LATEX_COMMAND:
++par;
break;
}
}
@ -326,6 +330,7 @@ void makeCommand(Buffer const & buf,
bool const main_tag_opened = openTag(os, style);
// Label around sectioning number:
// FIXME Probably need to account for LABEL_MANUAL
if (style.labeltype != LABEL_NO_LABEL) {
bool const label_tag_opened = openLabelTag(os, style);
os << pbegin->expandLabel(style, buf.params(), false);