X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=ca88dd774e9d48e7f0472b8db35972899af5c0d0;hb=2abde5d16254e8aac29e344442b09e6272000f13;hp=96c19c0f49799953722fc07216a84ad7a11e7ab2;hpb=654559feb8b4ed357647554b4043b6c631482b4e;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 96c19c0f49..ca88dd774e 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"
 
@@ -32,22 +31,16 @@ 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;
@@ -130,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,7 +194,7 @@ public:
 	/// Can we drop the standard paragraph wrapper?
 	bool emptyTag() const;
 
-	/// Get the id of the paragraph, usefull for docbook
+	/// Get the id of the paragraph, useful for DocBook
 	std::string getID(Buffer const & buf, OutputParams const & runparams) const;
 
 	/// Output the first word of a paragraph, return the position where it left.
@@ -210,11 +204,13 @@ public:
 	pos_type firstWordLyXHTML(XMLStream & xs, OutputParams const & runparams) const;
 
 	/// Outputs to stream the DocBook representation, one element per paragraph.
-	std::vector<docstring> simpleDocBookOnePar(Buffer const & buf,
+	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) const;
+							                   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.
@@ -243,6 +239,10 @@ public:
 	///
 	bool isPassThru() const;
 	///
+	bool parbreakIsNewline() const;
+	///
+	bool isPartOfTextSequence() const;
+	///
 	pos_type size() const;
 	///
 	bool empty() const;