X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetref.C;h=b6fccf4831454812d9da9976dabb845714e76d86;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=aa43f916406312865c1b875a4d7631d73c9c7f34;hpb=976b104ffee26b12d3379ad89f39443095b5496c;p=lyx.git

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index aa43f91640..b6fccf4831 100644
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -10,28 +10,35 @@
 #include "debug.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "lyxfunc.h"
 #include "LyXView.h"
 #include "frontends/Dialogs.h"
+#include "lyxfunc.h"
+#include "BufferView.h"
+#include "support/lstrings.h"
 
 using std::ostream;
 
-InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
+InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf, bool)
 	: InsetCommand(p), isLatex(buf.isLatex())
 {}
 
-void InsetRef::Edit(BufferView * bv, int, int, unsigned int button)
+void InsetRef::edit(BufferView * bv, int, int, unsigned int button)
 {
 	// Eventually trigger dialog with button 3 not 1
-	if (button == 3 )
+	if (button == 3)
 	  	bv->owner()->getLyXFunc()->
-			Dispatch(LFUN_REF_GOTO, getContents());
-	else if (button == 1 )
-		bv->owner()->getDialogs()->showRef( this );
+			dispatch(LFUN_REF_GOTO, getContents());
+	else if (button == 1)
+		bv->owner()->getDialogs()->showRef(this);
 }
 
 
-string const InsetRef::getScreenLabel() const
+void InsetRef::edit(BufferView *, bool)
+{
+}
+
+
+string const InsetRef::getScreenLabel(Buffer const *) const
 {
 	string temp;
 	for (int i = 0; !types[i].latex_name.empty(); ++ i)
@@ -50,27 +57,27 @@ string const InsetRef::getScreenLabel() const
 }
 
 
-int InsetRef::Latex(Buffer const *, ostream & os,
+int InsetRef::latex(Buffer const *, ostream & os,
 		    bool /*fragile*/, bool /*fs*/) const
 {
 	if (getOptions().empty())
 		os << escape(getCommand());
 	else {
-		InsetCommandParams p( getCmdName(), getContents(), "" );
+		InsetCommandParams p(getCmdName(), getContents(), "");
 		os << escape(p.getCommand());
 	}
 	return 0;
 }
 
 
-int InsetRef::Ascii(Buffer const *, ostream & os, int) const
+int InsetRef::ascii(Buffer const *, ostream & os, int) const
 {
 	os << "[" << getContents() << "]";
 	return 0;
 }
 
 
-int InsetRef::Linuxdoc(Buffer const *, ostream & os) const
+int InsetRef::linuxdoc(Buffer const *, ostream & os) const
 {
 	os << "<ref id=\"" << getContents()
 	   << "\" name=\"" << getOptions() << "\" >";
@@ -78,41 +85,25 @@ int InsetRef::Linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetRef::DocBook(Buffer const *, ostream & os) const
-{
-	os << "<link linkend=\"" << getContents()
-	   << "\">" << getOptions() << "</link>";
-	return 0;
-}
-
-
-// This function escapes 8-bit characters and other problematic characters
-// It's exactly the same code as in insetlabel.C.
-string const InsetRef::escape(string const & lab) const
+int InsetRef::docbook(Buffer const *, ostream & os) const
 {
-	char hexdigit[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
-			      '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-	string enc;
-	for (string::size_type i = 0; i < lab.length(); ++i) {
-		unsigned char c= lab[i];
-		if (c >= 128 || c == '=' || c == '%') {
-			enc += '=';
-			enc += hexdigit[c>>4];
-			enc += hexdigit[c & 15];
-		} else {
-			enc += c;
-		}
+	if (getOptions().empty()) {
+		os << "<xref linkend=\"" << getContents() << "\">";
+	} else {
+		os << "<link linkend=\"" << getContents()
+		   << "\">" << getOptions() << "</link>";
 	}
-	return enc;
+
+	return 0;
 }
 
 
-void InsetRef::Validate(LaTeXFeatures & features) const
+void InsetRef::validate(LaTeXFeatures & features) const
 {
 	if (getCmdName() == "vref" || getCmdName() == "vpageref")
-		features.varioref = true;
+		features.require("varioref");
 	else if (getCmdName() == "prettyref")
-		features.prettyref = true;
+		features.require("prettyref");
 }
 
 InsetRef::type_info InsetRef::types[] = {