Clean-up FileFilterList API.

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index a204661bc6ef8040b239bad914db3e04353ebf4f..017ec832d067c33951bf3029a2e8a2e36be646d6 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -35,7 +35,7 @@ class BufferView;
 class Counters;
 class InsetBase;
 class InsetBibitem;
-class InsetOld_code;
+class InsetBase_code;
 class Language;
 class LaTeXFeatures;
 class OutputParams;
@@ -122,21 +122,29 @@ public:
                             LyXFont const & outerfont, std::ostream &,
                             TexRow & texrow, OutputParams const &) const;
 
-       ///
+       /// Writes to stream the content of the paragraph for linuxdoc
        void simpleLinuxDocOnePar(Buffer const & buf,
                                  std::ostream & os,
                                  LyXFont const & outerfont,
                                  OutputParams const & runparams,
                                  lyx::depth_type depth) const;
 
+       /// Can we drop the standard paragraph wrapper?
+       bool Paragraph::emptyTag() const;
+
        /// Get the id of the paragraph, usefull for docbook and linuxdoc
-       std::string getID() const;
+       std::string getID(Buffer const & buf,
+                         OutputParams const & runparams) const;
 
        // Get the first word of a paragraph, return the position where it left
        lyx::pos_type getFirstWord(Buffer const & buf,
                                   std::ostream & os,
                                   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,
+                     lyx::pos_type initial) const;
+
        /// Writes to stream the docbook representation
        void simpleDocBookOnePar(Buffer const & buf,
                                 std::ostream &,
@@ -311,7 +319,7 @@ public:
        void insertInset(lyx::pos_type pos, InsetBase * inset,
                LyXFont const &, Change change = Change(Change::INSERTED));
        ///
-       bool insetAllowed(InsetOld_code code);
+       bool insetAllowed(InsetBase_code code);
        ///
        InsetBase * getInset(lyx::pos_type pos);
        ///
@@ -320,19 +328,16 @@ public:
        ///
        bool isHfill(lyx::pos_type pos) const;
        /// hinted by profiler
-       bool isInset(lyx::pos_type pos) const { return getChar(pos) == META_INSET; }
+       bool isInset(lyx::pos_type pos) const { return getChar(pos) == static_cast<value_type>(META_INSET); }
        ///
        bool isNewline(lyx::pos_type pos) const;
        ///
        bool isSeparator(lyx::pos_type pos) const;
        ///
        bool isLineSeparator(lyx::pos_type pos) const;
-       ///
-       bool isKomma(lyx::pos_type pos) const;
-       /// Used by the spellchecker
+       /// True if the character/inset at this point can be part of a word
+       // Note that digits in particular are considered as letters
        bool isLetter(lyx::pos_type pos) const;
-       ///
-       bool isWord(lyx::pos_type pos) const;
 
        /// returns -1 if inset not found
        int getPositionOfInset(InsetBase const * inset) const;