X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetRef.h;h=002fa64d10ab656287fa10324064def6c6863f9d;hb=15ae3eb85c5494b4343936108cb3b5b7c53bafe4;hp=40ee1ef25639c3e78d6b10b7c17ba6362918a931;hpb=c75d667e788bbb43f98698217afacc107b73d353;p=lyx.git

diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h
index 40ee1ef256..002fa64d10 100644
--- a/src/insets/InsetRef.h
+++ b/src/insets/InsetRef.h
@@ -17,7 +17,6 @@
 
 namespace lyx {
 
-
 /// The reference inset
 class InsetRef : public InsetCommand {
 public:
@@ -29,7 +28,7 @@ public:
 		///
 		std::string short_gui_name;
 	};
-	static type_info types[];
+	static const type_info types[];
 	///
 	static int getType(std::string const & name);
 	///
@@ -46,27 +45,34 @@ public:
 	docstring toolTip(BufferView const &, int, int) const
 		{ return tooltip_; }
 	///
+  docstring getTOCString() const;
+	///
 	bool hasSettings() const { return true; }
 	///
 	InsetCode lyxCode() const { return REF_CODE; }
 	///
 	DisplayType display() const { return Inline; }
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
 	docstring xhtml(XHTMLStream &, OutputParams const &) const;
-	/// the string that is passed to the TOC
-	void tocString(odocstream &) const;
+	/// 
+	void toString(odocstream &) const;
+	///
+	void forOutliner(docstring &, size_t) const;
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
 	void updateBuffer(ParIterator const & it, UpdateType);
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const & di, bool output_active) const;
+	///
+	bool forceLTR() const { return true; }
 	//@}
 
 	/// \name Static public methods obligated for InsetCommand derived classes
@@ -96,11 +102,16 @@ private:
 	///
 	Inset * clone() const { return new InsetRef(*this); }
 	//@}
+	
+	/// \return the label with things that need to be escaped escaped
+	docstring getEscapedLabel(OutputParams const &) const;
+	/// \return the command for a formatted reference to ref
+	/// \param label we're cross-referencing
+	/// \param argument for reference command
+	/// \param prefix of the label (before :)
+	docstring getFormattedCmd(docstring const & ref, docstring & label,
+			docstring & prefix) const;
 
-	///
-	bool isLatex;
-	/// Force inset into LTR environment if surroundings are RTL
-	bool forceLTR() const { return true; }
 	///
 	mutable docstring screen_label_;
 	///