X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetref.C;h=681aa2183bf1289ca29c712fce99c1509dcf8b3d;hb=76ef051b1cb1fb51c3ffd8ccc9105be4471e74d4;hp=ca83db0a0e9c5bb1c5a9aedeb0c04eb7eb56e865;hpb=4148a9244547e7184c1dcc8234e9e62d3143a42c;p=lyx.git

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index ca83db0a0e..681aa2183b 100644
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -10,26 +10,25 @@
 #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;
 
-extern BufferView * current_view;
-
-
-InsetRef::InsetRef(InsetCommandParams const & p)
-	: InsetCommand(p)
+InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
+	: InsetCommand(p), isLatex(buf.isLatex())
 {}
 
 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 )
+	else if (button == 1 )
 		bv->owner()->getDialogs()->showRef( this );
 }
 
@@ -37,20 +36,14 @@ void InsetRef::Edit(BufferView * bv, int, int, unsigned int button)
 string const InsetRef::getScreenLabel() const
 {
 	string temp;
-	if (getCmdName() == "ref")
-		temp = _( "Ref: " );
-	else if (getCmdName() == "pageref")
-		temp = _( "Page: " );
-	else if (getCmdName() == "vref")
-		temp = _( "TextRef: " );
-	else if (getCmdName() == "vpageref")
-		temp = _( "TextPage: " );
-	else
-		temp = _( "PrettyRef: " );
-
+	for (int i = 0; !types[i].latex_name.empty(); ++ i)
+		if (getCmdName() == types[i].latex_name) {
+			temp = _(types[i].short_gui_name);
+			break;
+		}
 	temp += getContents();
 
-	if(!current_view->buffer()->isLatex()
+	if (!isLatex
 	   && !getOptions().empty()) {
 		temp += "||";
 		temp += getOptions();
@@ -62,7 +55,7 @@ string const InsetRef::getScreenLabel() const
 int InsetRef::Latex(Buffer const *, ostream & os,
 		    bool /*fragile*/, bool /*fs*/) const
 {
-	if(getOptions().empty())
+	if (getOptions().empty())
 		os << escape(getCommand());
 	else {
 		InsetCommandParams p( getCmdName(), getContents(), "" );
@@ -89,30 +82,14 @@ 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
-{
-	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;
 }
 
 
@@ -120,6 +97,30 @@ void InsetRef::Validate(LaTeXFeatures & features) const
 {
 	if (getCmdName() == "vref" || getCmdName() == "vpageref")
 		features.varioref = true;
-	else if(getCmdName() == "prettyref")
+	else if (getCmdName() == "prettyref")
 		features.prettyref = true;
 }
+
+InsetRef::type_info InsetRef::types[] = {
+	{ "ref",	N_("Standard"),			N_("Ref: ")},
+	{ "pageref",	N_("Page Number"),		N_("Page: ")},
+	{ "vpageref",	N_("Textual Page Number"),	N_("TextPage: ")},
+	{ "vref",	N_("Standard+Textual Page"),	N_("Ref+Text: ")},
+	{ "prettyref",	N_("PrettyRef"),		N_("PrettyRef: ")},
+	{ "", "", "" }
+};
+
+
+int InsetRef::getType(string const & name)
+{
+	for (int i = 0; !types[i].latex_name.empty(); ++i)
+		if (name == types[i].latex_name)
+			return i;
+	return 0;
+}
+
+
+string const & InsetRef::getName(int type)
+{
+	return types[type].latex_name;
+}