LyX Drinkers United: patch 2

[lyx.git] / src / insets / insetref.C

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index da9df59036151ad55b183248b54118fe4c0e20d7..681aa2183bf1289ca29c712fce99c1509dcf8b3d 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -10,9 +10,11 @@
 #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;
 
@@ -80,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;
 }
 
 
@@ -123,3 +109,18 @@ InsetRef::type_info InsetRef::types[] = {
        { "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;
+}