Fix wrong scope for listitems.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9116 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index b00f2352248368fae16f0250ac1368324bcb2b17..6544bd3abf91a423560792725edd9429e1685c03 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/output_docbook.C b/src/output_docbook.C
index dce118707e299c27d7191123a5b11ae6be666c5e..7f57209a6dc6511590399e47827e0727689a2c29 100644 (file)
--- 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: