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

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index bb985a9ed8..681aa2183b 100644
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -1,66 +1,49 @@
 #include <config.h>
 
-#include <cstdlib>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include FORMS_H_LOCATION 
 #include "insetref.h"
 #include "buffer.h"
+#include "commandtags.h"
 #include "debug.h"
-#include "lyx_gui_misc.h" // CancelCloseBoxCB
+#include "gettext.h"
+#include "LaTeXFeatures.h"
 #include "LyXView.h"
+#include "frontends/Dialogs.h"
 #include "lyxfunc.h"
-#include "commandtags.h"
-#include "gettext.h"
+#include "BufferView.h"
+#include "support/lstrings.h"
 
 using std::ostream;
 
-extern BufferView * current_view;
-
-
-InsetRef::InsetRef(string const & cmd, Buffer * bf)
-	: master(bf)
-{
-	scanCommand(cmd);
-	if (getCmdName() == "ref")
-		flag = InsetRef::REF;
-	else
-		flag = InsetRef::PAGE_REF;
-}
-
-
-InsetRef::InsetRef(InsetCommand const & inscmd, Buffer * bf)
-	: master(bf)
-{
-	setCmdName(inscmd.getCmdName());
-	setContents(inscmd.getContents());
-	setOptions(inscmd.getOptions());
-	if (getCmdName() == "ref")
-		flag = InsetRef::REF;
-	else
-		flag = InsetRef::PAGE_REF;
-}
-
+InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
+	: InsetCommand(p), isLatex(buf.isLatex())
+{}
 
-void InsetRef::Edit(BufferView * bv, int, int, unsigned int)
+void InsetRef::Edit(BufferView * bv, int, int, unsigned int button)
 {
-        bv->owner()->getLyXFunc()->
-		Dispatch(LFUN_REFGOTO, getContents().c_str());
+	// Eventually trigger dialog with button 3 not 1
+	if (button == 3 )
+	  	bv->owner()->getLyXFunc()->
+			Dispatch(LFUN_REF_GOTO, getContents());
+	else if (button == 1 )
+		bv->owner()->getDialogs()->showRef( this );
 }
 
 
-string InsetRef::getScreenLabel() const
+string const InsetRef::getScreenLabel() const
 {
 	string temp;
-	if (flag == InsetRef::PAGE_REF)
-		temp += _("Page: ");
-	else 
-		temp += _("Ref: ");
+	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();
@@ -69,22 +52,27 @@ string InsetRef::getScreenLabel() const
 }
 
 
-int InsetRef::Latex(ostream & os,
+int InsetRef::Latex(Buffer const *, ostream & os,
 		    bool /*fragile*/, bool /*fs*/) const
 {
-	if(getOptions().empty())
+	if (getOptions().empty())
 		os << escape(getCommand());
 	else {
-		string ns;
-		InsetCommand clone = InsetCommand(getCmdName(),
-						  getContents(), ns);
-		os << escape(clone.getCommand());
+		InsetCommandParams p( getCmdName(), getContents(), "" );
+		os << escape(p.getCommand());
 	}
 	return 0;
 }
 
 
-int InsetRef::Linuxdoc(ostream & os) const
+int InsetRef::Ascii(Buffer const *, ostream & os, int) const
+{
+	os << "[" << getContents() << "]";
+	return 0;
+}
+
+
+int InsetRef::Linuxdoc(Buffer const *, ostream & os) const
 {
 	os << "<ref id=\"" << getContents()
 	   << "\" name=\"" << getOptions() << "\" >";
@@ -92,30 +80,47 @@ int InsetRef::Linuxdoc(ostream & os) const
 }
 
 
-int InsetRef::DocBook(ostream & os) const
+int InsetRef::DocBook(Buffer const *, ostream & os) const
 {
-	os << "<link linkend=\"" << getContents()
-	   << "\">" << getOptions() << "</link>";
+	if (getOptions().empty()) {
+		os << "<xref linkend=\"" << getContents() << "\"/>";
+	} else {
+		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 InsetRef::escape(string const & lab) const
+void InsetRef::Validate(LaTeXFeatures & features) 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;
-		}
-	}
-	return enc;
+	if (getCmdName() == "vref" || getCmdName() == "vpageref")
+		features.varioref = true;
+	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;
 }