get rid of broken_header.h and some unneeded tests

[lyx.git] / src / mathed / ref_inset.C

diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C
index 2706f76bbc70b431b0ae3c4de99cfb8394b6a932..12d502a153e88441e6b75b0858a47397859b4a1d 100644 (file)
--- a/src/mathed/ref_inset.C
+++ b/src/mathed/ref_inset.C
@@ -14,6 +14,7 @@
 
 #include "BufferView.h"
 #include "LaTeXFeatures.h"
+#include "buffer.h"
 #include "cursor.h"
 #include "debug.h"
 #include "funcrequest.h"
@@ -21,6 +22,8 @@
 #include "math_data.h"
 #include "math_factory.h"
 #include "math_support.h"
+#include "outputparams.h"
+#include "sgml.h"
 
 #include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
@@ -53,7 +56,7 @@ void RefInset::infoize(std::ostream & os) const
 }
 
 
-void RefInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void RefInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
        case LFUN_INSET_MODIFY:
@@ -88,7 +91,7 @@ void RefInset::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                break;
 
        default:
-               CommandInset::priv_dispatch(cur, cmd);
+               CommandInset::doDispatch(cur, cmd);
                break;
        }
 }
@@ -131,17 +134,21 @@ int RefInset::plaintext(std::ostream & os, OutputParams const &) const
 int RefInset::linuxdoc(std::ostream & os, OutputParams const &) const
 {
        os << "<ref id=\"" << asString(cell(0))
-          << "\" name=\"" << asString(cell(1)) << "\" >";
+          << "\" name=\"" << asString(cell(1)) << "\">";
        return 0;
 }
 
 
-int RefInset::docbook(std::ostream & os, OutputParams const &) const
+int RefInset::docbook(Buffer const & buf, std::ostream & os, OutputParams const & runparams) const
 {
        if (cell(1).empty()) {
-               os << "<xref linkend=\"" << asString(cell(0)) << "\">";
+               os << "<xref linkend=\"" << sgml::cleanID(buf, runparams, asString(cell(0)));
+               if (runparams.flavor == OutputParams::XML)
+                       os << "\"/>";
+               else
+                       os << "\">";
        } else {
-               os << "<link linkend=\"" << asString(cell(0))
+               os << "<link linkend=\"" << sgml::cleanID(buf, runparams, asString(cell(0)))
                   << "\">" << asString(cell(1)) << "</link>";
        }