X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=67f41ddb8d4cbfbdfe355880bc9b95f532f8d890;hb=6fa973b3771ff9ff61d82ae3cbebad8442d30816;hp=d5c02e4053dc6290f9f445641f3702edda4104e3;hpb=228d738868991092c34d9924707594ede19c44cb;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index d5c02e4053..67f41ddb8d 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -16,7 +16,6 @@
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
 
-#include "FontEnums.h"
 #include "LayoutEnums.h"
 #include "SpellChecker.h"
 
@@ -24,6 +23,7 @@
 #include "support/types.h"
 
 #include <set>
+#include <vector>
 
 namespace lyx {
 
@@ -31,28 +31,25 @@ class AuthorList;
 class Buffer;
 class BufferParams;
 class Change;
-class Counters;
-class Cursor;
-class CursorSlice;
 class DocIterator;
 class docstring_list;
 class DocumentClass;
 class Inset;
-class InsetBibitem;
 class LaTeXFeatures;
 class InsetList;
 class Language;
 class Layout;
 class Font;
-class MetricsInfo;
 class OutputParams;
-class PainterInfo;
 class ParagraphParameters;
 class TocBackend;
 class WordLangTuple;
-class XHTMLStream;
+class XMLStream;
 class otexstream;
 
+/// Inset identifier (above 0x10ffff, for ucs-4)
+char_type const META_INSET = 0x200001;
+
 class FontSpan {
 public:
 	/// Invalid font span containing no character
@@ -126,7 +123,8 @@ enum AsStringParameter
 	AS_STR_INSETS = 2, ///< Go into insets.
 	AS_STR_NEWLINES = 4, ///< Get also newline characters.
 	AS_STR_SKIPDELETE = 8, ///< Skip deleted text in change tracking.
-	AS_STR_PLAINTEXT = 16 ///< Don't export formatting when descending into insets.
+	AS_STR_PLAINTEXT = 16, ///< Don't export formatting when descending into insets.
+	AS_STR_MATHED = 32 ///< Use a format suitable for mathed (eg. for InsetRef).
 };
 
 
@@ -200,26 +198,29 @@ public:
 	std::string getID(Buffer const & buf, OutputParams const & runparams) const;
 
 	/// Output the first word of a paragraph, return the position where it left.
-	pos_type firstWordDocBook(odocstream & os, OutputParams const & runparams) const;
+	pos_type firstWordDocBook(XMLStream & xs, OutputParams const & runparams) const;
 
 	/// Output the first word of a paragraph, return the position where it left.
-	pos_type firstWordLyXHTML(XHTMLStream & xs, OutputParams const & runparams) const;
-
-	/// Writes to stream the docbook representation
-	void simpleDocBookOnePar(Buffer const & buf,
-				 odocstream &,
-				 OutputParams const & runparams,
-				 Font const & outerfont,
-				 pos_type initial = 0) const;
+	pos_type firstWordLyXHTML(XMLStream & xs, OutputParams const & runparams) const;
+
+	/// Outputs to stream the DocBook representation, one element per paragraph.
+	std::tuple<std::vector<docstring>, std::vector<docstring>, std::vector<docstring>>
+	simpleDocBookOnePar(Buffer const & buf,
+							                   OutputParams const & runparams,
+							                   Font const & outerfont,
+							                   pos_type initial = 0,
+							                   bool is_last_par = false,
+							                   bool ignore_fonts = false) const;
+
 	/// \return any material that has had to be deferred until after the
 	/// paragraph has closed.
 	docstring simpleLyXHTMLOnePar(Buffer const & buf,
-				 XHTMLStream & xs,
-				 OutputParams const & runparams,
-				 Font const & outerfont,
-				 bool start_paragraph = true,
-				 bool close_paragraph = true,
-				 pos_type initial = 0) const;
+								  XMLStream & xs,
+								  OutputParams const & runparams,
+								  Font const & outerfont,
+								  bool start_paragraph = true,
+								  bool close_paragraph = true,
+								  pos_type initial = 0) const;
 
 	///
 	bool hasSameLayout(Paragraph const & par) const;
@@ -306,8 +307,6 @@ public:
 	///
 	docstring expandLabel(Layout const &, BufferParams const &) const;
 	///
-	docstring expandDocBookLabel(Layout const &, BufferParams const &) const;
-	///
 	docstring const & labelString() const;
 	/// the next two functions are for the manual labels
 	docstring const getLabelWidthString() const;
@@ -341,12 +340,8 @@ public:
 	///
 	Font const & getFirstFontSettings(BufferParams const &) const;
 
-	/** Get fully instantiated font. If pos == -1, use the layout
-	    font attached to this paragraph.
-	    If pos == -2, use the label font of the layout attached here.
-	    In all cases, the font is instantiated, i.e. does not have any
-	    attributes with values FONT_INHERIT, FONT_IGNORE or
-	    FONT_TOGGLE.
+	/** Get fully instantiated font, i.e., one that does not have any
+	    attributes with values FONT_INHERIT, FONT_IGNORE or FONT_TOGGLE.
 	*/
 	Font const getFont(BufferParams const &, pos_type pos,
 			      Font const & outerfont) const;