Restore correct version check for AA_UseHighDpiPixmaps - amend change ae56fb6171

[features.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 0752dfeb0a76b494d5282f0c9bb7d9e0fe2aa7a2..d6e4a7667af63fed93add7c1fc4804d1076d250b 100644 (file)
--- 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"
 
@@ -124,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).
 };
 
 
@@ -204,7 +204,8 @@ 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,
@@ -238,6 +239,8 @@ public:
        ///
        bool isPassThru() const;
        ///
+       bool isPartOfTextSequence() const;
+       ///
        pos_type size() const;
        ///
        bool empty() const;