unify toclevel for articles and reports/books; proper numbering of Paragraph/SubParag...

[lyx.git] / src / paragraph_pimpl.h

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 8d1977d8a347f7feb58add3cd29183509afea3af..35db59cf8d62d5bdf96c1d42e43735247a7bbd1b 100644 (file)
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -1,42 +1,43 @@
 // -*- C++ -*-
 /**
  * \file paragraph_pimpl.h
- * Copyright 1995-2003 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef PARAGRAPH_PIMPL_H
 #define PARAGRAPH_PIMPL_H
 
 #include "paragraph.h"
-#include "ParagraphParameters.h"
+
 #include "changes.h"
-#include "counters.h"
+#include "lyxfont.h"
+#include "ParagraphParameters.h"
 
 #include <boost/scoped_ptr.hpp>
 
 class LyXLayout;
 
-struct Paragraph::Pimpl {
-       ///
-       typedef std::vector<value_type> TextContainer;
 
+class Paragraph::Pimpl {
+public:
        ///
        Pimpl(Paragraph * owner);
-       /// Copy constructor
+       /// "Copy constructor"
        Pimpl(Pimpl const &, Paragraph * owner);
        ///
-       lyx::pos_type size() const {
-               return text.size();
-       }
-       ///
-       bool empty() const {
-               return text.empty();
-       }
-       ///
-       void clear();
-       ///
        void setContentsFromPar(Paragraph const & par);
+
+       //
+       // Change tracking
+       //
        /// set tracking mode
        void trackChanges(Change::Type type = Change::UNCHANGED);
        /// stop tracking
@@ -51,32 +52,25 @@ struct Paragraph::Pimpl {
        bool isChanged(lyx::pos_type start, lyx::pos_type end) const;
        /// is there a non-addition in this range ?
        bool isChangeEdited(lyx::pos_type start, lyx::pos_type end) const;
-
        /// set change at pos
        void setChange(lyx::pos_type pos, Change::Type type);
-
        /// mark as erased
        void markErased();
-
        /// accept change
        void acceptChange(lyx::pos_type start, lyx::pos_type end);
-
        /// reject change
        void rejectChange(lyx::pos_type start, lyx::pos_type end);
-
        /// are we tracking changes ?
-       bool tracking() const {
-               return changes_.get();
-       }
+       bool tracking() const { return changes_.get(); }
 
        ///
        value_type getChar(lyx::pos_type pos) const;
        ///
        void setChar(lyx::pos_type pos, value_type c);
        ///
-       void insertChar(lyx::pos_type pos, value_type c, LyXFont const & font, Change change = Change(Change::INSERTED));
+       void insertChar(lyx::pos_type pos, value_type c, Change change);
        ///
-       void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const & font, Change change = Change(Change::INSERTED));
+       void insertInset(lyx::pos_type pos, InsetBase * inset, Change change);
        /// definite erase
        void eraseIntern(lyx::pos_type pos);
        /// erase the given position. Returns true if it was actually erased
@@ -97,21 +91,29 @@ struct Paragraph::Pimpl {
            and font_i covers the chars in positions pos_{i-1}+1,...,pos_i
            (font_1 covers the chars 0,...,pos_1) (Dekel)
        */
-       struct FontTable  {
+       class FontTable  {
+       public:
                ///
                FontTable(lyx::pos_type p, LyXFont const & f)
-                       : pos_(p)
-                       {
-                               font_ = container.get(f);
-                       }
+                       : pos_(p), font_(f)
+               {
+#if 0
+                       font_ = container.get(f);
+#endif
+               }
                ///
                lyx::pos_type pos() const { return pos_; }
                ///
                void pos(lyx::pos_type p) { pos_ = p; }
                ///
-               LyXFont const & font() const { return *font_; }
+               LyXFont const & font() const { return font_; }
+#if 0
                ///
                void font(LyXFont const & f) { font_ = container.get(f);}
+#else
+               ///
+               void font(LyXFont const & f) { font_ = f;}
+#endif
        private:
                /// End position of paragraph this font attribute covers
                lyx::pos_type pos_;
@@ -124,16 +126,20 @@ struct Paragraph::Pimpl {
                    The values LyXFont::IGNORE_* and LyXFont::TOGGLE are NOT
                    allowed in these font tables.
                */
+#if 0
                boost::shared_ptr<LyXFont> font_;
                ///
                static ShareContainer<LyXFont> container;
+#else
+               LyXFont font_;
+#endif
        };
        ///
-       friend struct matchFT;
+       friend class matchFT;
        ///
-       struct matchFT {
+       class matchFT {
+       public:
                /// used by lower_bound and upper_bound
-               inline
                int operator()(FontTable const & a, FontTable const & b) const {
                        return a.pos() < b.pos();
                }
@@ -151,9 +157,9 @@ struct Paragraph::Pimpl {
                             LyXFont const & font,
                             LyXLayout const & style);
        ///
-       void simpleTeXSpecialChars(Buffer const *, BufferParams const &,
+       void simpleTeXSpecialChars(Buffer const &, BufferParams const &,
                                   std::ostream &, TexRow & texrow,
-                                  LatexRunParams const &,
+                                  OutputParams const &,
                                   LyXFont & font, LyXFont & running_font,
                                   LyXFont & basefont,
                                   LyXFont const & outerfont,
@@ -175,16 +181,16 @@ struct Paragraph::Pimpl {
        ParagraphParameters params;
 
 private:
+       ///
+       lyx::pos_type size() const { return owner_->size(); }
        /// match a string against a particular point in the paragraph
-       bool isTextAt(string const & str, lyx::pos_type pos) const;
+       bool isTextAt(std::string const & str, lyx::pos_type pos) const;
 
        /// for recording and looking up changes in revision tracking mode
        boost::scoped_ptr<Changes> changes_;
 
        /// Who owns us?
        Paragraph * owner_;
-       ///
-       TextContainer text;
 };
 
 #endif