#include "Cursor.h"
#include "DispatchResult.h"
#include "InsetLabel.h"
+#include "Language.h"
#include "LaTeXFeatures.h"
#include "LyX.h"
#include "OutputParams.h"
// the command: \pfxcmd{suffix}.
//
// for prettyref, we return "\prettyref" and put ref into label
-// and pfx into prefix. this is because prettyref
+// and pfx into prefix. this is because prettyref uses the whole
+// label, thus: \prettyref{pfx:suffix}.
//
docstring InsetRef::getFormattedCmd(docstring const & ref,
docstring & label, docstring & prefix) const
}
-int InsetRef::latex(odocstream & os, OutputParams const & rp) const
+void InsetRef::latex(otexstream & os, OutputParams const & rp) const
{
string const cmd = getCmdName();
- if (cmd != "formatted") {
+ docstring const data = getEscapedLabel(rp);
+
+ if (rp.inulemcmd)
+ os << "\\mbox{";
+
+ if (cmd == "eqref" && buffer().params().use_refstyle) {
+ // we advertise this as printing "(n)", so we'll do that, at least
+ // for refstyle, since refstlye's own \eqref prints, by default,
+ // "equation n". if one wants \eqref, one can get it by using a
+ // formatted label in this case.
+ os << '(' << from_ascii("\\ref{") << data << from_ascii("})");
+ }
+ else if (cmd == "formatted") {
+ docstring label;
+ docstring prefix;
+ docstring const fcmd = getFormattedCmd(data, label, prefix);
+ os << fcmd << '{' << label << '}';
+ }
+ 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;
os << p.getCommand(rp);
- return 0;
- }
-
- // so we're doing a formatted reference.
- docstring const data = getEscapedLabel(rp);
- docstring label;
- docstring prefix;
- docstring const fcmd = getFormattedCmd(data, label, prefix);
- os << fcmd << '{' << label << '}';
- return 0;
+ }
+
+ if (rp.inulemcmd)
+ os << "}";
}
-int InsetRef::plaintext(odocstream & os, OutputParams const &) const
+int InsetRef::plaintext(odocstringstream & os,
+ OutputParams const &, size_t) const
{
docstring const str = getParam("reference");
os << '[' << str << ']';
}
-docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const & op) const
{
docstring const & ref = getParam("reference");
InsetLabel const * il = buffer().insetLabel(ref);
// 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");
+ // normally would be "on page #", but we have no pages.
+ display_string = translateIfPossible(from_ascii("elsewhere"),
+ op.local_font->language()->lang());
else if (cmd == "eqref")
- display_string = bformat(from_ascii("equation (%1$s)"), value);
- else if (cmd == "prettyref"
- // we don't really have the ability to handle these
- // properly in XHTML output
- || cmd == "nameref")
+ display_string = '(' + value + ')';
+ else if (cmd == "formatted")
+ display_string = il->prettyCounter();
+ else if (cmd == "nameref")
+ // FIXME We don't really have the ability to handle these
+ // properly in XHTML output yet (bug #8599).
+ // It might not be that hard to do. We have the InsetLabel,
+ // and we can presumably find its paragraph using the TOC.
+ // We could then output the contents of the paragraph using
+ // something?
display_string = il->prettyCounter();
} else
display_string = ref;
void InsetRef::toString(odocstream & os) const
{
- plaintext(os, OutputParams(0));
+ odocstringstream ods;
+ plaintext(ods, OutputParams(0));
+ os << ods.str();
+}
+
+
+void InsetRef::forToc(docstring & os, size_t) const
+{
+ // There's no need for details in the TOC, and a long label
+ // will just get in the way.
+ os += '#';
}
{
docstring const & ref = getParam("reference");
// register this inset into the buffer reference cache.
- buffer().references(ref).push_back(make_pair(this, it));
+ buffer().addReference(ref, this, it);
docstring label;
for (int i = 0; !types[i].latex_name.empty(); ++i) {
}
label += ref;
- if (!buffer().isLatex() && !getParam("name").empty()) {
+ if (!buffer().params().isLatex() && !getParam("name").empty()) {
label += "||";
label += getParam("name");
}
}
-void InsetRef::addToToc(DocIterator const & cpit)
+void InsetRef::addToToc(DocIterator const & cpit, bool output_active) const
{
docstring const & label = getParam("reference");
if (buffer().insetLabel(label))
// It seems that this reference does not point to any valid label.
screen_label_ = _("BROKEN: ") + screen_label_;
Toc & toc = buffer().tocBackend().toc("label");
- toc.push_back(TocItem(cpit, 0, screen_label_));
+ toc.push_back(TocItem(cpit, 0, screen_label_, output_active));
}
string const cmd = getCmdName();
if (cmd == "vref" || cmd == "vpageref")
features.require("varioref");
- else if (getCmdName() == "formatted") {
+ else if (cmd == "formatted") {
docstring const data = getEscapedLabel(features.runparams());
docstring label;
docstring prefix;
+ string const fcmd = to_utf8(getFormattedCmd(data, label, prefix));
if (buffer().params().use_refstyle) {
features.require("refstyle");
- string const fcmd = to_utf8(getFormattedCmd(data, label, prefix));
- if (!prefix.empty()) {
+ if (prefix == "cha")
+ features.addPreambleSnippet("\\let\\charef=\\chapref");
+ else if (!prefix.empty()) {
string lcmd = "\\AtBeginDocument{\\providecommand" +
fcmd + "[1]{\\ref{" + to_utf8(prefix) + ":#1}}}";
features.addPreambleSnippet(lcmd);
- } else if (prefix == "cha")
- features.addPreambleSnippet("\\let\\charef=\\chapref");
+ }
} else {
features.require("prettyref");
// prettyref uses "cha" for chapters, so we provide a kind of
if (prefix == "chap")
features.addPreambleSnippet("\\let\\pr@chap=\\pr@cha");
}
- } else if (getCmdName() == "eqref" && !buffer().params().use_refstyle)
- // refstyle defines its own version
+ } else if (cmd == "eqref" && !buffer().params().use_refstyle)
+ // with refstyle, we simply output "(\ref{label})"
features.require("amsmath");
else if (cmd == "nameref")
features.require("nameref");
projects / lyx.git / blobdiff