X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.h;h=8c647fbff919e5d85bd64fdbf855ea05d01510ac;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=a77bf92875e8ef05ddd30723a133ad541810b853;hpb=ecef54500d4d77baf4fa47eac2253679875ac08c;p=lyx.git

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index a77bf92875..8c647fbff9 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -17,8 +17,6 @@
 #include "ColorCode.h"
 #include "Text.h"
 
-#include "insets/InsetLayout.h"
-
 namespace lyx {
 
 class CompletionList;
@@ -49,7 +47,7 @@ public:
 	void setBuffer(Buffer &);
 
 	///
-	Dimension const dimension(BufferView const &) const;
+	Dimension const dimensionHelper(BufferView const &) const;
 
 	/// empty inset to empty par
 	void clear();
@@ -61,10 +59,14 @@ public:
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
+	/// Drawing background is handled in draw
+	virtual void drawBackground(PainterInfo &, int, int) const {}
 	///
 	bool editable() const { return true; }
 	///
 	bool canTrackChanges() const { return true; }
+	/// Rely on RowPainter to draw the cue of inline insets.
+	bool canPaintChange(BufferView const &) const { return allowMultiPar(); }
 	///
 	InsetText * asInsetText() { return this; }
 	///
@@ -106,10 +108,6 @@ public:
 	///
 	void setText(docstring const &, Font const &, bool trackChanges);
 	///
-	void setAutoBreakRows(bool);
-	///
-	bool getAutoBreakRows() const { return text_.autoBreakRows_; }
-	///
 	void setDrawFrame(bool);
 	///
 	ColorCode frameColor() const;
@@ -159,11 +157,14 @@ public:
 	virtual bool allowMultiPar() const { return getLayout().isMultiPar(); }
 	///
 	/// should paragraphs be forced to use the empty layout?
-	virtual bool forcePlainLayout(idx_type = 0) const 
+	virtual bool forcePlainLayout(idx_type = 0) const
 		{ return getLayout().forcePlainLayout(); }
 	/// should the user be allowed to customize alignment, etc.?
-	virtual bool allowParagraphCustomization(idx_type = 0) const 
+	virtual bool allowParagraphCustomization(idx_type = 0) const
 		{ return getLayout().allowParagraphCustomization(); }
+	/// should paragraphs be forced to use a local font language switch?
+	virtual bool forceLocalFontSwitch() const
+		{ return getLayout().forcelocalfontswitch(); }
 
 	/// Update the counters of this inset and of its contents
 	virtual void updateBuffer(ParIterator const &, UpdateType);
@@ -172,9 +173,10 @@ public:
 	///
 	void toString(odocstream &) const;
 	///
-	void forToc(docstring &, size_t) const;
+	void forOutliner(docstring &, size_t const, bool const) const;
 	///
-	void addToToc(DocIterator const &) const;
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype) const;
 	///
 	Inset * clone() const { return new InsetText(*this); }
 	///
@@ -201,10 +203,14 @@ public:
 	/// returns the text to be used as tooltip
 	/// \param prefix: a string that will preced the tooltip,
 	/// e.g., "Index: ".
-	/// \param numlines: the number of lines in the tooltip
-	/// \param len: length of those lines
+	/// \param len: length of the resulting string
+	/// NOTE This routine is kind of slow. It's fine to use it within the 
+	/// GUI, but definitely do not try to use it in updateBuffer or anything
+	/// of that sort. (Note: unnecessary internal copies have been removed
+	/// since the previous note. The efficiency would have to be assessed
+	/// again by profiling.)
 	docstring toolTipText(docstring prefix = empty_docstring(),
-			size_t numlines = 5, size_t len = 80) const;
+	                      size_t len = 400) const;
 
 	///
 	std::string contextMenu(BufferView const &, int, int) const;
@@ -214,20 +220,22 @@ public:
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 protected:
 	///
-	InsetCaption const * getCaptionInset() const;
-	///
-	docstring getCaptionText(OutputParams const &) const;
-	///
-	docstring getCaptionHTML(OutputParams const &) const;
+	void iterateForToc(DocIterator const & cdit, bool output_active,
+					   UpdateType utype) const;
 private:
+	/// Open the toc item for paragraph pit. Returns the paragraph index where
+	/// it should end.
+	pit_type openAddToTocForParagraph(pit_type pit,
+	                                  DocIterator const & dit,
+	                                  bool output_active) const;
+	/// Close a toc item opened in start and closed in end
+	void closeAddToTocForParagraph(pit_type start, pit_type end) const;
 	///
 	bool drawFrame_;
 	///
 	ColorCode frame_color_;
 	///
-	mutable pit_type old_pit;
-	///
-	mutable Text text_;
+	Text text_;
 };