X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetRef.cpp;h=9a3209f894df83ef646da71ef7e0ddb2d8029fbe;hb=c3a8b3a566e9e90f9ade72acbc723232d721d0b1;hp=f1838c28fcf71a2bfe74fce5969dbef1799e7710;hpb=e158e07c29a2066ac408d1b0038382623180da9c;p=lyx.git

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index f1838c28fc..9a3209f894 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -15,22 +15,20 @@
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "LyXFunc.h"
 #include "OutputParams.h"
 #include "sgml.h"
 
+#include "support/docstream.h"
 #include "support/lstrings.h"
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::escape;
-
-using std::string;
-using std::ostream;
-
 
 InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
 	: InsetCommand(p, "ref"), isLatex(buf.isLatex())
@@ -42,6 +40,27 @@ InsetRef::InsetRef(InsetRef const & ir)
 {}
 
 
+bool InsetRef::isCompatibleCommand(string const & s) {
+	//FIXME This is likely not the best way to handle this.
+	//But this stuff is hardcoded elsewhere already.
+	return s == "ref" 
+		|| s == "pageref"
+		|| s == "vref" 
+		|| s == "vpageref"
+		|| s == "prettyref"
+		|| s == "eqref";
+}
+
+
+CommandInfo const * InsetRef::findInfo(string const & /* cmdName */)
+{
+	static const char * const paramnames[] = {"name", "reference", ""};
+	static const bool isoptional[] = {true, false};
+	static const CommandInfo info = {2, paramnames, isoptional};
+	return &info;
+}
+
+
 void InsetRef::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action) {
@@ -126,10 +145,9 @@ int InsetRef::docbook(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetRef::textString(Buffer const & buf, odocstream & os,
-		       OutputParams const & op) const
+void InsetRef::textString(Buffer const & buf, odocstream & os) const
 {
-	return plaintext(buf, os, op);
+	plaintext(buf, os, OutputParams(0));
 }