Pure HTML output for math macros.

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

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index ae7f3b3ca7e06e971aa9b854b6da16585083597f..1c00f745f092ca9854d3681f30342f3ae6345835 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -15,8 +15,9 @@
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
+#include "InsetLabel.h"
 #include "LaTeXFeatures.h"
-#include "LyXFunc.h"
+#include "LyX.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
 #include "ParIterator.h"
@@ -60,25 +61,20 @@ ParamInfo const & InsetRef::findInfo(string const & /* cmdName */)
        static ParamInfo param_info_;
        if (param_info_.empty()) {
                param_info_.add("name", ParamInfo::LATEX_OPTIONAL);
-               param_info_.add("reference", ParamInfo::LATEX_REQUIRED);
+               param_info_.add("reference", ParamInfo::LATEX_REQUIRED,
+                               ParamInfo::HANDLING_ESCAPE);
        }
        return param_info_;
 }
 
 
-docstring InsetRef::screenLabel() const
-{
-       return screen_label_;
-}
-
-
-int InsetRef::latex(odocstream & os, OutputParams const &) const
+int InsetRef::latex(odocstream & os, OutputParams const & runparams) const
 {
        // 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, getCmdName());
        p["reference"] = getParam("reference");
-       os << escape(p.getCommand());
+       os << p.getCommand(runparams);
        return 0;
 }
 
@@ -118,41 +114,79 @@ int InsetRef::docbook(odocstream & os, OutputParams const & runparams) const
 
 docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
+       docstring const & ref = getParam("reference");
+       InsetLabel const * il = buffer().insetLabel(ref);
+       string const & cmd = params().getCmdName();
+       docstring display_string;
+
+       if (il && !il->counterValue().empty()) {
+               // Try to construct a label from the InsetLabel we reference.
+               docstring const & value = il->counterValue();
+               if (cmd == "ref")
+                       display_string = value;
+               else if (cmd == "vref")
+                       // normally, would be "ref on page #", but we have no pages
+                       display_string = value;
+               else if (cmd == "pageref" || cmd == "vpageref")
+                       // normally would be "on page #", but we have no pages
+                       display_string = _("elsewhere");
+               else if (cmd == "eqref")
+                       display_string = bformat(from_ascii("equation (%1$s)"), value);
+               else { // "prettyref"
+                       display_string = il->prettyCounter();
+               }
+       } else 
+                       display_string = ref;
+
        // FIXME What we'd really like to do is to be able to output some
        // appropriate sort of text here. But to do that, we need to associate
        // some sort of counter with the label, and we don't have that yet.
-       docstring const ref = html::cleanAttr(getParam("reference"));
-       string const attr = "href=\"#" + to_utf8(ref) + "\"";
-       xs << StartTag("a", attr);
-       xs << ref;
-       xs << EndTag("a");
+       string const attr = "href=\"#" + html::cleanAttr(to_utf8(ref)) + "\"";
+       xs << html::StartTag("a", attr);
+       xs << display_string;
+       xs << html::EndTag("a");
        return docstring();
 }
 
+
 void InsetRef::tocString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }
 
 
-void InsetRef::updateLabels(ParIterator const & it, bool)
+void InsetRef::updateBuffer(ParIterator const & it, UpdateType)
 {
-       docstring const & label = getParam("reference");
+       docstring const & ref = getParam("reference");
        // register this inset into the buffer reference cache.
-       buffer().references(label).push_back(make_pair(this, it));
+       buffer().references(ref).push_back(make_pair(this, it));
 
+       docstring label;
        for (int i = 0; !types[i].latex_name.empty(); ++i) {
                if (getCmdName() == types[i].latex_name) {
-                       screen_label_ = _(types[i].short_gui_name);
+                       label = _(types[i].short_gui_name);
                        break;
                }
        }
-       screen_label_ += label;
+       label += ref;
 
        if (!isLatex && !getParam("name").empty()) {
-               screen_label_ += "||";
-               screen_label_ += getParam("name");
+               label += "||";
+               label += getParam("name");
+       }
+       
+       screen_label_ = label;
+       bool shortened = false;
+       unsigned int const maxLabelChars = 24;
+       if (screen_label_.size() > maxLabelChars) {
+               screen_label_.erase(maxLabelChars - 3);
+               screen_label_ += "...";
+               shortened = true;
        }
+       if (shortened)
+               tooltip_ = label;
+       else 
+               tooltip_ = from_ascii("");
 }
 
 
@@ -187,7 +221,7 @@ InsetRef::type_info InsetRef::types[] = {
        { "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_("FormatRef: ")},
+       { "prettyref", N_("PrettyRef"),             N_("FrmtRef: ")},
        { "", "", "" }
 };