Revert 23154.

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index d59753decec9ac77799a633cad6b8e9f88165974..3c9e533562d0bf2e6959df1a973727609a0df5a7 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -23,9 +23,6 @@
 
 #include "support/strfwd.h"
 #include "support/types.h"
-// FIXME: would be nice to forward declare odocstream instead of
-// including this:
-#include "support/docstream.h"
 
 namespace lyx {
 
@@ -46,6 +43,7 @@ class MetricsInfo;
 class OutputParams;
 class PainterInfo;
 class ParagraphParameters;
+class TextClass;
 class TexRow;
 
 
@@ -148,8 +146,11 @@ public:
        ///
        InsetCode ownerCode() const;
        ///
-       bool forceDefaultParagraphs() const;
-
+       bool forceEmptyLayout() const;
+       ///
+       bool allowParagraphCustomization() const;
+       ///
+       bool useEmptyLayout() const;
        ///
        pos_type size() const;
        ///
@@ -158,7 +159,9 @@ public:
        ///
        LayoutPtr const & layout() const;
        ///
-       void layout(LayoutPtr const & new_layout);
+       void setLayout(LayoutPtr const & layout);
+       ///
+       void setEmptyOrDefaultLayout(TextClass const & tc);
 
        /// This is the item depth, only used by enumerate and itemize
        signed char itemdepth;
@@ -201,7 +204,7 @@ public:
        void setBeginOfBody();
 
        ///
-       docstring const & getLabelstring() const;
+       docstring const & labelString() const;
 
        /// the next two functions are for the manual labels
        docstring const getLabelWidthString() const;
@@ -347,22 +350,13 @@ public:
        /// was previously past that position. Return 0 otherwise.
        int checkBiblio(bool track_changes);
 
-       /// To resolve macros properly the paragraphs are numbered.
-       /// Every macro definition is stored with its paragraph number
-       /// as well. Only those macros with a smaller number become 
-       /// visible in a paragraph (plus those in the same paragraph, but
-       /// in an earlier inset.
-       unsigned int macrocontextPosition() const;
-       ///
-       void setMacrocontextPosition(unsigned int pos);
-
        /// For each author, set 'used' to true if there is a change
        /// by this author in the paragraph.
        void checkAuthors(AuthorList const & authorList);
 
        ///
        void changeCase(BufferParams const & bparams, pos_type pos,
-               pos_type right, TextCase action);
+               pos_type & right, TextCase action);
 
        /// find \param str string inside Paragraph.
        /// \return true if the specified string is at the specified position