X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_docbook.cpp;h=b3bdae2d6bcb31b2248e94b8337fb6c08471fcc7;hb=09df753df4c24470617c64d25eae6df2db85dfed;hp=0aa20adac0d0c9719e199d72c1a4ac58044fb4c7;hpb=0bf9ac02a8988b2747c15520780cbf4343dd6a45;p=lyx.git

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 0aa20adac0..b3bdae2d6b 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -16,22 +16,23 @@
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferParams.h"
-#include "OutputParams.h"
 #include "Counters.h"
 #include "debug.h"
+#include "Layout.h"
+#include "OutputParams.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
 #include "sgml.h"
 
-#include "insets/InsetCommand.h"
-
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/convert.h"
 #include "support/types.h"
 
+#include <boost/next_prior.hpp>
+
 
 namespace lyx {
 
@@ -61,11 +62,11 @@ ParagraphList::const_iterator searchCommand(
 		ParagraphList::const_iterator const & par,
 		ParagraphList::const_iterator const & pend)
 {
-	Layout_ptr const & bstyle = par->layout();
+	LayoutPtr const & bstyle = par->layout();
 	ParagraphList::const_iterator p = boost::next(par);
 
 	for ( ; p != pend; ++p) {
-		Layout_ptr const & style = p->layout();
+		LayoutPtr const & style = p->layout();
 		if (style->latextype == LATEX_COMMAND
 				&& style->commanddepth <= bstyle->commanddepth)
 			return p;
@@ -78,10 +79,10 @@ ParagraphList::const_iterator searchEnvironment(
 		ParagraphList::const_iterator const & par,
 		ParagraphList::const_iterator const & pend)
 {
-	Layout_ptr const & bstyle = par->layout();
+	LayoutPtr const & bstyle = par->layout();
 	ParagraphList::const_iterator p = boost::next(par);
 	for (; p != pend; ++p) {
-		Layout_ptr const & style = p->layout();
+		LayoutPtr const & style = p->layout();
 		if (style->latextype == LATEX_COMMAND)
 			return p;
 
@@ -109,8 +110,8 @@ ParagraphList::const_iterator makeParagraph(Buffer const & buf,
 					    ParagraphList::const_iterator const & pbegin,
 					    ParagraphList::const_iterator const & pend)
 {
-	Layout_ptr const & defaultstyle =
-		buf.params().getLyXTextClass().defaultLayout();
+	LayoutPtr const & defaultstyle =
+		buf.params().getTextClass().defaultLayout();
 	for (ParagraphList::const_iterator par = pbegin; par != pend; ++par) {
 		if (par != pbegin)
 			os << '\n';
@@ -134,8 +135,8 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
 					      ParagraphList::const_iterator const & pend) {
 	ParagraphList::const_iterator par = pbegin;
 
-	Layout_ptr const & defaultstyle = buf.params().getLyXTextClass().defaultLayout();
-	Layout_ptr const & bstyle = par->layout();
+	LayoutPtr const & defaultstyle = buf.params().getTextClass().defaultLayout();
+	LayoutPtr const & bstyle = par->layout();
 	string item_tag;
 
 	// Opening outter tag
@@ -145,7 +146,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
 		os << "<![CDATA[";
 
 	while (par != pend) {
-		Layout_ptr const & style = par->layout();
+		LayoutPtr const & style = par->layout();
 		ParagraphList::const_iterator send;
 		string id = par->getID(buf, runparams);
 		string wrapper = "";
@@ -247,7 +248,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
 					  ParagraphList::const_iterator const & pend)
 {
 	ParagraphList::const_iterator par = pbegin;
-	Layout_ptr const & bstyle = par->layout();
+	LayoutPtr const & bstyle = par->layout();
 
 	//Open outter tag
 	sgml::openTag(buf, os, runparams, *pbegin);
@@ -269,7 +270,7 @@ ParagraphList::const_iterator makeCommand(Buffer const & buf,
 
 	++par;
 	while (par != pend) {
-		Layout_ptr const & style = par->layout();
+		LayoutPtr const & style = par->layout();
 		ParagraphList::const_iterator send;
 
 		switch (style->latextype) {
@@ -319,9 +320,9 @@ void docbookParagraphs(ParagraphList const & paragraphs,
 		const_cast<OutputParams&>(runparams).par_begin = 0;
 		const_cast<OutputParams&>(runparams).par_end = 0;
 	}
-	
+
 	while (par != pend) {
-		Layout_ptr const & style = par->layout();
+		LayoutPtr const & style = par->layout();
 		ParagraphList::const_iterator lastpar = par;
 		ParagraphList::const_iterator send;