Forgot to add this files.

[lyx.git] / src / lyxparagraph.h

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index dd84cf2210c61bbddbb9eef80a5550036a53f54a..31589a68bf8391c4bae81b45d9be048a6c97602a 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -89,7 +89,7 @@ public:
 #endif
                ///
                META_NEWLINE,
-               ///
+               //
                //META_PROTECTED_SEPARATOR,
                ///
                META_INSET
@@ -188,9 +188,12 @@ public:
 
        ///
        LyXParagraph * TeXEnvironment(Buffer const *, BufferParams const &,
-                                     std::ostream &, TexRow & texrow,
-                                     std::ostream & foot, TexRow & foot_texrow,
-                                     int & foot_count);
+                                     std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+                                     ,std::ostream & foot, TexRow & foot_texrow,
+                                     int & foot_count
+#endif
+               );
        ///
        LyXParagraph * Clone() const;
        
@@ -217,6 +220,7 @@ public:
        void SetInsetOwner(Inset * i);
        ///
        void deleteInsetsLyXText(BufferView *);
+       ///
        void resizeInsetsLyXText(BufferView *);
 private:
        ///
@@ -264,8 +268,6 @@ public:
        /// footnote, margin, fig, tab
        footnote_kind footnotekind;
 #endif
-       //@Man: the LyX- DTP-switches
-       //@{
        ///
        bool line_top;
        
@@ -293,7 +295,9 @@ private:
 public:
        ///
        void setCounter(int i, int v) { counter_[i] = v; }
+       ///
        int getCounter(int i) const { return counter_[i]; }
+       ///
        void incCounter(int i) { counter_[i]++; }
        ///
        bool start_of_appendix;
@@ -326,7 +330,6 @@ public:
        
        ///
        string labelwidthstring;
-       //@}
        
        ///
        LyXParagraph * next;
@@ -369,12 +372,11 @@ public:
        LyXParagraph * FirstPhysicalPar();
        ///
        LyXParagraph const * FirstPhysicalPar() const;
-#endif
-
        /// returns the physical paragraph
        LyXParagraph * ParFromPos(size_type pos);
        /// returns the position in the physical par
        int PositionInParFromPos(size_type pos) const;
+#endif
 
        /// for the environments
        LyXParagraph * DepthHook(int depth);
@@ -421,16 +423,14 @@ public:
        LyXFont GetFirstFontSettings() 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 LyXFont::INHERIT, LyXFont::IGNORE or 
-         LyXFont::TOGGLE.
-         */
+           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 LyXFont::INHERIT, LyXFont::IGNORE or 
+           LyXFont::TOGGLE.
+       */
        LyXFont getFont(BufferParams const &, size_type pos) const;
        ///
-       value_type GetChar(size_type pos);
-       ///
        value_type GetChar(size_type pos) const;
        /// The position must already exist.
        void SetChar(size_type pos, value_type c) {
@@ -523,11 +523,11 @@ public:
 
 #ifndef NEW_INSETS
        /** A paragraph following a footnote is a "dummy". A paragraph
-         with a footnote in it is stored as three paragraphs:
-         First a paragraph with the text up to the footnote, then
-         one (or more) paragraphs with the footnote, and finally
-         the a paragraph with the text after the footnote. Only the
-         first paragraph keeps information  about layoutparameters, */
+           with a footnote in it is stored as three paragraphs:
+           First a paragraph with the text up to the footnote, then
+           one (or more) paragraphs with the footnote, and finally
+           the a paragraph with the text after the footnote. Only the
+           first paragraph keeps information  about layoutparameters, */
        bool IsDummy() const;
 #endif
         /* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE
@@ -598,6 +598,7 @@ private:
                ///
                FontTable(size_type p, LyXFont const & f) {pos = p; font = f;}
        };
+       ///
        friend struct matchFT;
        ///
        struct matchFT {
@@ -619,9 +620,12 @@ private:
        InsetList insetlist;
        ///
        LyXParagraph * TeXDeeper(Buffer const *, BufferParams const &,
-                                std::ostream &, TexRow & texrow,
-                                std::ostream & foot, TexRow & foot_texrow,
-                                int & foot_count);
+                                std::ostream &, TexRow & texrow
+#ifndef NEW_INSETS
+                                ,std::ostream & foot, TexRow & foot_texrow,
+                                int & foot_count
+#endif
+               );
 #ifndef NEW_INSETS
        ///
        LyXParagraph * TeXFootnote(Buffer const *, BufferParams const &,
@@ -659,23 +663,32 @@ private:
        ///
        static unsigned int paragraph_id;
 public:
+       ///
        class inset_iterator {
        public:
+               ///
                inset_iterator() {}
+               //
                inset_iterator(InsetList::iterator const & iter) : it(iter) {};
+               ///
                inset_iterator & operator++() {
                        ++it;
                        return *this;
                }
+               ///
                Inset * operator*() { return (*it).inset; }
+               ///
                size_type getPos() {return (*it).pos; }
+               ///
                bool operator==(inset_iterator const & iter) const {
                        return it == iter.it;
                }
+               ///
                bool operator!=(inset_iterator const & iter) const {
                        return it != iter.it;
                }
        private:
+               ///
                InsetList::iterator it;
        };
        ///