Fix wrong scope for listitems.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9116 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2004-10-24 18:28:18 +00:00
parent da075d3c90
commit 755672f60f
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2004-10-24 José Matos <jamatos@lyx.org>
* output_docbook.C (makeEnvironment, searchEnvironment): place
CDATA inside paragraphs and fix scope for listitems.
2004-10-24 José Matos <jamatos@lyx.org>
* output_docbook.C: remove using statement for stack.

View File

@ -83,7 +83,10 @@ ParagraphList::const_iterator searchEnvironment(ParagraphList::const_iterator co
return p;
}
if( style->latexname() != bstyle->latexname() and p->params().depth() <= par->params().depth())
if(p->params().depth() < par->params().depth())
return p;
if( style->latexname() != bstyle->latexname() and p->params().depth() == par->params().depth() )
return p;
}
return pend;
@ -166,8 +169,8 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
counters.step("para");
id = tostr(counters.value("para"));
id = " id=\""+ subst(defaultstyle->latexparam(), "#", id) + '"';
wrapper = defaultstyle->latexname();
}
wrapper = defaultstyle->latexname();
sgml::openTag(os, depth, true, bstyle->itemtag());
}
default: