* do not ignore "requires" field in MathMacro

[lyx.git] / src / Paragraph.h

diff --git a/src/Paragraph.h b/src/Paragraph.h
index c345a5bb6f2459a51846c704b290bac51807693f..3a39620c85adae7c39cdd73479413f67256002ad 100644 (file)
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -20,7 +20,7 @@
 #include "Dimension.h"
 #include "InsetList.h"
 #include "lyxlayout_ptr_fwd.h"
-#include "RowList_fwd.h"
+#include "Row.h"
 
 #include "insets/Inset.h" // only for Inset::Code
 
@@ -36,8 +36,8 @@ class InsetBibitem;
 class LaTeXFeatures;
 class Inset_code;
 class Language;
-class LyXFont;
-class LyXFont_size;
+class Font;
+class Font_size;
 class MetricsInfo;
 class OutputParams;
 class PainterInfo;
@@ -125,7 +125,7 @@ public:
 
        ///
        bool simpleTeXOnePar(Buffer const &, BufferParams const &,
-                            LyXFont const & outerfont, odocstream &,
+                            Font const & outerfont, odocstream &,
                             TexRow & texrow, OutputParams const &) const;
 
        /// Can we drop the standard paragraph wrapper?
@@ -141,14 +141,14 @@ public:
                                   OutputParams const & runparams) const;
 
        /// Checks if the paragraph contains only text and no inset or font change.
-       bool onlyText(Buffer const & buf, LyXFont const & outerfont,
+       bool onlyText(Buffer const & buf, Font const & outerfont,
                      pos_type initial) const;
 
        /// Writes to stream the docbook representation
        void simpleDocBookOnePar(Buffer const & buf,
                                 odocstream &,
                                 OutputParams const & runparams,
-                                LyXFont const & outerfont,
+                                Font const & outerfont,
                                 pos_type initial = 0) const;
 
        ///
@@ -172,9 +172,9 @@ public:
        bool empty() const { return text_.empty(); }
 
        ///
-       LyXLayout_ptr const & layout() const;
+       Layout_ptr const & layout() const;
        ///
-       void layout(LyXLayout_ptr const & new_layout);
+       void layout(Layout_ptr const & new_layout);
 
        /// This is the item depth, only used by enumerate and itemize
        signed char itemdepth;
@@ -236,7 +236,7 @@ public:
        docstring const translateIfPossible(docstring const & label,
                BufferParams const & bparams) const;
        /// Expand the counters for the labelstring of \c layout
-       docstring expandLabel(LyXLayout_ptr const &, BufferParams const &,
+       docstring expandLabel(Layout_ptr const &, BufferParams const &,
                bool process_appendix = true) const;
        /// Actual paragraph alignment used
        char getAlign() const;
@@ -245,7 +245,7 @@ public:
        /// The maximal possible depth of a paragraph after this one
        depth_type getMaxDepthAfter() const;
        ///
-       void applyLayout(LyXLayout_ptr const & new_layout);
+       void applyLayout(Layout_ptr const & new_layout);
 
        /// (logically) erase the char at pos; return true if it was actually erased
        bool eraseChar(pos_type pos, bool trackChanges);
@@ -256,24 +256,24 @@ public:
            between the characters font and the layoutfont.
            This is what is stored in the fonttable
        */
-       LyXFont const
+       Font const
        getFontSettings(BufferParams const &, pos_type pos) const;
        ///
-       LyXFont 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.
            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.
+           attributes with values Font::INHERIT, Font::IGNORE or
+           Font::TOGGLE.
        */
-       LyXFont const getFont(BufferParams const &, pos_type pos,
-                             LyXFont const & outerfont) const;
-       LyXFont const getLayoutFont(BufferParams const &,
-                                   LyXFont const & outerfont) const;
-       LyXFont const getLabelFont(BufferParams const &,
-                                  LyXFont const & outerfont) const;
+       Font const getFont(BufferParams const &, pos_type pos,
+                             Font const & outerfont) const;
+       Font const getLayoutFont(BufferParams const &,
+                                   Font const & outerfont) const;
+       Font const getLabelFont(BufferParams const &,
+                                  Font const & outerfont) const;
        /**
         * The font returned by the above functions is the same in a
         * span of characters. This method will return the first and
@@ -287,27 +287,27 @@ public:
        /// Get the char, but mirror all bracket characters if it is right-to-left
        value_type getUChar(BufferParams const &, pos_type pos) const;
        /// pos <= size() (there is a dummy font change at the end of each par)
-       void setFont(pos_type pos, LyXFont const & font);
+       void setFont(pos_type pos, Font const & font);
        /// Returns the height of the highest font in range
-       LyXFont_size highestFontInRange(pos_type startpos,
-                                       pos_type endpos, LyXFont_size def_size) const;
+       Font_size highestFontInRange(pos_type startpos,
+                                       pos_type endpos, Font_size def_size) const;
        ///
        void insert(pos_type pos, docstring const & str,
-                   LyXFont const & font, Change const & change);
+                   Font const & font, Change const & change);
        ///
        void insertChar(pos_type pos, value_type c, bool trackChanges);
        ///
        void insertChar(pos_type pos, value_type c,
-                       LyXFont const &, bool trackChanges);
+                       Font const &, bool trackChanges);
        ///
        void insertChar(pos_type pos, value_type c,
-                       LyXFont const &, Change const & change);
+                       Font const &, Change const & change);
        ///
        void insertInset(pos_type pos, Inset * inset,
                         Change const & change);
        ///
        void insertInset(pos_type pos, Inset * inset,
-                        LyXFont const &, Change const & change);
+                        Font const &, Change const & change);
        ///
        bool insetAllowed(Inset_code code);
        ///
@@ -370,7 +370,7 @@ public:
 private:
 
        ///
-       LyXLayout_ptr layout_;
+       Layout_ptr layout_;
        /**
         * Keeping this here instead of in the pimpl makes LyX >10% faster
         * for average tasks as buffer loading/switching etc.