From 755672f60ff4a3c229b193d54224bb9be11777c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Matox?= Date: Sun, 24 Oct 2004 18:28:18 +0000 Subject: [PATCH] Fix wrong scope for listitems. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9116 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/output_docbook.C | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b00f235224..6544bd3abf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-10-24 José Matos + + * output_docbook.C (makeEnvironment, searchEnvironment): place + CDATA inside paragraphs and fix scope for listitems. + 2004-10-24 José Matos * output_docbook.C: remove using statement for stack. diff --git a/src/output_docbook.C b/src/output_docbook.C index dce118707e..7f57209a6d 100644 --- a/src/output_docbook.C +++ b/src/output_docbook.C @@ -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: -- 2.39.2