* pl.po remerge by autotools

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 0f4039e0c857d61a8fb4c7860cefbfd0e8ad409b..f4110e260f5fe820ab2a56de19d862fafd3a4d18 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -36,14 +36,17 @@ class Lexer;
 class PainterInfo;
 class Spacing;
 
-/// This class encapsulates the main text data and operations in LyX
+/// This class encapsulates the main text data and operations in LyX.
+/// This is more or less the private implementation of InsetText.
 class Text {
-public:
-       /// constructor
-       explicit Text(InsetText * owner)
-               : owner_(owner), autoBreakRows_(false)
-       {}
+private:
+       /// Default constructor.
+       Text(InsetText * owner, bool use_default_layout);
 
+       /// Copy constructor.
+       Text(InsetText * owner, Text const & text);
+
+public:
        /// \return true if there's no content at all.
        /// \warning a non standard layout on an empty paragraph doesn't
        // count as empty.
@@ -63,16 +66,17 @@ public:
                Font const & font, Font const & display_font);
 
        /** Needed to propagate font changes to all text cells of insets
-        *  that are not allowed inside a font change (bug 1973).
+        *  that are not allowed inside a font change (bugs 1973, 6919).
         *  Must not be called if \p pos denotes an ordinary character or an
         *  inset that is alowed inside a font change.
-        *  FIXME: This should be removed, see documentation of noFontChange
-        *  in insetbase.h
         */
        void setInsetFont(BufferView const & bv, pit_type pit, pos_type pos,
                Font const & font, bool toggleall = false);
 
        /// what you expect when pressing \<enter\> at cursor position
+       /// \param inverse_logic if false, the same layout is set for the
+       /// new paragraph if the layout is an environment; if true, the
+       /// same layout is set if it is not an environment
        void breakParagraph(Cursor & cur, bool inverse_logic = false);
 
        /// set layout over selection
@@ -120,6 +124,12 @@ public:
        ///
        docstring asString(pit_type beg, pit_type end,
                int options = AS_STR_NONE) const;
+       /// Appends a possibly abbreviated representation of our text
+       /// to \param os, where \param maxlen defines the maximum size
+       /// of \param os. If \param shorten is true, then we will shorten
+       /// \param os to maxlen chars and replace the final three by "...,
+       /// if \param os is longer than maxlen chars.
+       void forToc(docstring & os, size_t maxlen, bool shorten = true) const;
 
        /// insert a character at cursor position
        /// FIXME: replace Cursor with DocIterator.
@@ -312,6 +322,15 @@ public:
        bool insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/);
        ///
        docstring completionPrefix(Cursor const & cur) const;
+       /// for the environments
+       pit_type depthHook(pit_type par, depth_type depth) const;
+       ///
+       pit_type outerHook(pit_type par) const;
+       /// Is it the first par with same depth and layout?
+       bool isFirstInSequence(pit_type par) const;
+       /// Get the font of the "environment" of paragraph \p par_offset in \p pars.
+       /// All font changes of the paragraph are relative to this font.
+       Font const outerFont(pit_type par_offset) const;
 
 private:
        /// The InsetText owner shall have access to everything.
@@ -359,6 +378,8 @@ private:
        bool autoBreakRows_;
        /// position of the text in the buffer.
        DocIterator macrocontext_position_;
+       ///
+       unsigned int undo_counter_;
 };
 
 
@@ -375,29 +396,12 @@ void breakParagraphConservative(BufferParams const & bparams,
 void mergeParagraph(BufferParams const & bparams,
        ParagraphList & paragraphs, pit_type par);
 
-
-/// for the environments
-pit_type depthHook(pit_type par,
-       ParagraphList const & plist, depth_type depth);
-
-pit_type outerHook(pit_type par, ParagraphList const & plist);
-
-/// Is it the first par with same depth and layout?
-bool isFirstInSequence(pit_type par, ParagraphList const & plist);
-
-/** Check if the current paragraph is the last paragraph in a
-    proof environment */
-int getEndLabel(pit_type par, ParagraphList const & plist);
-
-/**
- * Get the font of the "environment" of paragraph \p par_offset in \p pars.
- * All font changes of the paragraph are relative to this font.
- */
-Font const outerFont(pit_type par_offset, ParagraphList const & pars);
-
 /// accept the changes within the complete ParagraphList
 void acceptChanges(ParagraphList & pars, BufferParams const & bparams);
 
+/// reject the changes within the complete ParagraphList
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams);
+
 } // namespace lyx
 
 #endif // TEXT_H