Fix bug 4441. GuiRef: Ok button must be default.

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 06318200c92aa0720111828ee95c270386b6b301..075eb32f345c3eca5298770edabf57c8be77f690 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -5,10 +5,10 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -78,7 +78,8 @@ enum AsStringParameter
 {
        AS_STR_NONE = 0, ///< No option, only printable characters.
        AS_STR_LABEL = 1, ///< Prefix with paragraph label.
-       AS_STR_INSETS = 2 ///< Go into insets.
+       AS_STR_INSETS = 2, ///< Go into insets.
+       AS_STR_NEWLINES = 4 ///< Get also newline characters.
 };
 
 
@@ -123,6 +124,10 @@ public:
        docstring asString(pos_type beg, pos_type end,
                int options = AS_STR_NONE) const;
 
+       /// Extract only the explicitly visible text (without any formatting),
+       /// descending into insets
+       docstring stringify(pos_type beg, pos_type end, int options, OutputParams & runparams) const;
+
        ///
        void write(std::ostream &, BufferParams const &,
                   depth_type & depth) const;
@@ -131,7 +136,8 @@ public:
 
        ///
        bool latex(BufferParams const &, Font const & outerfont, odocstream &,
-               TexRow & texrow, OutputParams const &) const;
+                  TexRow & texrow, OutputParams const &,
+                  int start_pos = 0, int end_pos = -1) const;
 
        /// Can we drop the standard paragraph wrapper?
        bool emptyTag() const;
@@ -178,6 +184,10 @@ public:
        void setLayout(Layout const & layout);
        ///
        void setPlainOrDefaultLayout(DocumentClass const & tc);
+       ///
+       void setDefaultLayout(DocumentClass const & tc);
+       ///
+       void setPlainLayout(DocumentClass const & tc);
 
        /// This is the item depth, only used by enumerate and itemize
        signed char itemdepth;
@@ -253,10 +263,10 @@ public:
            between the characters font and the layoutfont.
            This is what is stored in the fonttable
        */
-       Font const
+       Font const &
        getFontSettings(BufferParams const &, pos_type pos) const;
        ///
-       Font const getFirstFontSettings(BufferParams const &) const;
+       Font const & getFirstFontSettings(BufferParams const &) const;
 
        /** Get fully instantiated font. If pos == -1, use the layout
            font attached to this paragraph.