DocBook: escape IDs for InsetRef.

[lyx.git] / src / insets / InsetRef.cpp

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index d4cdaac30cd8a725ef28573209d7d187cf8a50a7..c5d097a37b8128a7881f419a8af1cf43bd9c327d 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -287,8 +287,6 @@ void InsetRef::latex(otexstream & os, OutputParams const & rp) const
                }
        }
        else {
-               // We don't want to output p_["name"], since that is only used
-               // in docbook. So we construct new params, without it, and use that.
                InsetCommandParams p(REF_CODE, cmd);
                docstring const ref = getParam("reference");
                p["reference"] = ref;
@@ -309,28 +307,59 @@ int InsetRef::plaintext(odocstringstream & os,
 }
 
 
-int InsetRef::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetRef::docbook(XMLStream & xs, OutputParams const &) const
 {
+       docstring const & ref = getParam("reference");
+       InsetLabel const * il = buffer().insetLabel(ref, true);
+       string const & cmd = params().getCmdName();
+       docstring linkend = xml::cleanID(ref);
+
+       // A name is provided, LyX will provide it. This is supposed to be a very rare case.
+       // Link with linkend, as is it within the document (not outside, in which case xlink:href is better suited).
        docstring const & name = getParam("name");
-       if (name.empty()) {
-               if (runparams.flavor == OutputParams::DOCBOOK5) {
-                       os << "<xref linkend=\""
-                          << xml::cleanID(getParam("reference"))
-                          << "\" />";
-               } else {
-                       os << "<xref linkend=\""
-                          << xml::cleanID(getParam("reference"))
-                          << "\">";
+       if (!name.empty()) {
+               docstring attr = from_utf8("linkend=\"") + linkend + from_utf8("\"");
+
+               xs << xml::StartTag("link", to_utf8(attr));
+               xs << name;
+               xs << xml::EndTag("link");
+               return;
+       }
+
+       // The DocBook processor will generate the name when required.
+       docstring display_before;
+       docstring display_after;
+       docstring role;
+
+       if (il && !il->counterValue().empty()) {
+               // Try to construct a label from the InsetLabel we reference.
+               if (cmd == "vref" || cmd == "pageref" || cmd == "vpageref" || cmd == "nameref" || cmd == "formatted") {
+                       // "ref on page #", "on page #", etc. The DocBook processor deals with generating the right text,
+                       // including in the right language.
+                       role = from_ascii(cmd);
+
+                       if (cmd == "formatted") {
+                               // A formatted reference may have many parameters. Generate all of them as roles, the only
+                               // way arbitrary parameters can be passed into DocBook.
+                               if (buffer().params().use_refstyle && getParam("caps") == "true")
+                                       role += " refstyle-caps";
+                               if (buffer().params().use_refstyle && getParam("plural") == "true")
+                                       role += " refstyle-plural";
+                       }
+               } else if (cmd == "eqref") {
+                       display_before = from_ascii("(");
+                       display_after = from_ascii(")");
                }
-       } else {
-               os << "<link linkend=\""
-                  << xml::cleanID(getParam("reference"))
-                  << "\">"
-                  << getParam("name")
-                  << "</link>";
+               // TODO: what about labelonly? I don't get how this is supposed to work...
        }
 
-       return 0;
+       // No name, ask DocBook to generate one.
+       docstring attr = from_utf8("linkend=\"") + xml::cleanID(ref) + from_utf8("\"");
+       if (!role.empty())
+               attr += " role=\"" + role + "\"";
+       xs << display_before;
+       xs << xml::CompTag("xref", to_utf8(attr));
+       xs << display_after;
 }