#include "Encoding.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "InsetIterator.h"
+#include "InsetLayout.h"
#include "InsetList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
-#include "Length.h"
#include "LyX.h"
-#include "OutputParams.h"
-#include "output_xhtml.h"
-#include "sgml.h"
+#include "xml.h"
+#include "texstream.h"
#include "TocBackend.h"
#include "frontends/FontMetrics.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/gettext.h"
+#include "support/Length.h"
#include "support/lstrings.h"
using namespace std;
/////////////////////////////////////////////////////////////////////
InsetNomencl::InsetNomencl(Buffer * buf, InsetCommandParams const & p)
- : InsetCommand(buf, p),
- nomenclature_entry_id(sgml::uniqueID(from_ascii("nomen")))
+ : InsetCommand(buf, p)
{}
if (param_info_.empty()) {
param_info_.add("prefix", ParamInfo::LATEX_OPTIONAL);
param_info_.add("symbol", ParamInfo::LATEX_REQUIRED,
- ParamInfo::HANDLING_LATEXIFY);
+ ParamInfo::ParamHandling(ParamInfo::HANDLING_LATEXIFY
+ | ParamInfo::HANDLING_INDEX_ESCAPE));
param_info_.add("description", ParamInfo::LATEX_REQUIRED,
- ParamInfo::HANDLING_LATEXIFY);
+ ParamInfo::ParamHandling(ParamInfo::HANDLING_LATEXIFY
+ | ParamInfo::HANDLING_INDEX_ESCAPE));
+ param_info_.add("literal", ParamInfo::LYX_INTERNAL);
}
return param_info_;
}
docstring InsetNomencl::screenLabel() const
{
size_t const maxLabelChars = 25;
-
docstring label = _("Nom: ") + getParam("symbol");
- if (label.size() > maxLabelChars) {
- label.erase(maxLabelChars - 3);
- label += "...";
- }
+ support::truncateWithEllipsis(label, maxLabelChars);
return label;
}
}
-
-int InsetNomencl::docbook(odocstream & os, OutputParams const &) const
+int InsetNomencl::plaintext(odocstringstream & os,
+ OutputParams const &, size_t) const
{
- os << "<glossterm linkend=\"" << nomenclature_entry_id << "\">"
- << sgml::escapeString(getParam("symbol"))
- << "</glossterm>";
- return 0;
+ docstring s = "[" + getParam("symbol") + ": " + getParam("description") + "]";
+ os << s;
+ return s.size();
}
-docstring InsetNomencl::xhtml(XHTMLStream &, OutputParams const &) const
+void InsetNomencl::docbook(XMLStream & xs, OutputParams const &) const
{
- return docstring();
+ docstring attr = "linkend=\"" + xml::cleanID(from_ascii("nomen") + getParam("symbol")) + "\"";
+ xs << xml::StartTag("glossterm", attr);
+ xs << xml::escapeString(getParam("symbol"));
+ xs << xml::EndTag("glossterm");
}
-int InsetNomencl::docbookGlossary(odocstream & os) const
+docstring InsetNomencl::xhtml(XMLStream &, OutputParams const &) const
{
- os << "<glossentry id=\"" << nomenclature_entry_id << "\">\n"
- << "<glossterm>"
- << sgml::escapeString(getParam("symbol"))
- << "</glossterm>\n"
- << "<glossdef><para>"
- << sgml::escapeString(getParam("description"))
- << "</para></glossdef>\n"
- <<"</glossentry>\n";
- return 4;
+ return docstring();
}
void InsetNomencl::validate(LaTeXFeatures & features) const
{
features.require("nomencl");
+ InsetCommand::validate(features);
}
-void InsetNomencl::addToToc(DocIterator const & cpit, bool output_active) const
+void InsetNomencl::addToToc(DocIterator const & cpit, bool output_active,
+ UpdateType, TocBackend & backend) const
{
docstring const str = getParam("symbol");
- buffer().tocBackend().toc("nomencl").push_back(TocItem(cpit, 0, str, output_active));
+ TocBuilder & b = backend.builder("nomencl");
+ b.pushItem(cpit, str, output_active);
+ b.pop();
}
ParamInfo const & InsetPrintNomencl::findInfo(string const & /* cmdName */)
{
- // The symbol width is set via nomencl's \nomlabelwidth in
+ // The symbol width is set via nomencl's \nomlabelwidth in
// InsetPrintNomencl::latex and not as optional parameter of
// \printnomenclature
static ParamInfo param_info_;
struct NomenclEntry {
- NomenclEntry() {}
+ NomenclEntry() : par(nullptr) {}
NomenclEntry(docstring s, docstring d, Paragraph const * p)
: symbol(s), desc(d), par(p)
{}
typedef map<docstring, NomenclEntry > EntryMap;
-docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const & op) const
+docstring InsetPrintNomencl::xhtml(XMLStream &, OutputParams const & op) const
{
- Toc const & toc = buffer().tocBackend().toc("nomencl");
+ shared_ptr<Toc const> toc = buffer().tocBackend().toc("nomencl");
EntryMap entries;
- Toc::const_iterator it = toc.begin();
- Toc::const_iterator const en = toc.end();
+ Toc::const_iterator it = toc->begin();
+ Toc::const_iterator const en = toc->end();
for (; it != en; ++it) {
DocIterator dit = it->dit();
Paragraph const & par = dit.innerParagraph();
InsetCommand const * ic = inset->asInsetCommand();
if (!ic)
return docstring();
-
+
// FIXME We need a link to the paragraph here, so we
// need some kind of struct.
docstring const symbol = ic->getParam("symbol");
docstring const desc = ic->getParam("description");
docstring const prefix = ic->getParam("prefix");
docstring const sortas = prefix.empty() ? symbol : prefix;
-
+
entries[sortas] = NomenclEntry(symbol, desc, &par);
}
-
+
if (entries.empty())
return docstring();
-
+
// we'll use our own stream, because we are going to defer everything.
// that's how we deal with the fact that we're probably inside a standard
// paragraph, and we don't want to be.
odocstringstream ods;
- XHTMLStream xs(ods);
-
+ XMLStream xs(ods);
+
InsetLayout const & il = getLayout();
string const & tag = il.htmltag();
docstring toclabel = translateIfPossible(from_ascii("Nomenclature"),
- op.local_font->language()->lang());
-
- xs << html::StartTag("div", "class='nomencl'")
- << html::StartTag(tag, "class='nomencl'")
- << toclabel
- << html::EndTag(tag)
- << html::CR()
- << html::StartTag("dl")
- << html::CR();
-
+ getLocalOrDefaultLang(op)->lang());
+
+ xs << xml::StartTag("div", "class='nomencl'")
+ << xml::StartTag(tag, "class='nomencl'")
+ << toclabel
+ << xml::EndTag(tag)
+ << xml::CR()
+ << xml::StartTag("dl")
+ << xml::CR();
+
EntryMap::const_iterator eit = entries.begin();
EntryMap::const_iterator const een = entries.end();
for (; eit != een; ++eit) {
NomenclEntry const & ne = eit->second;
string const parid = ne.par->magicLabel();
- xs << html::StartTag("dt")
- << html::StartTag("a", "href='#" + parid + "' class='nomencl'")
+ xs << xml::StartTag("dt")
+ << xml::StartTag("a", "href='#" + parid + "' class='nomencl'")
<< ne.symbol
- << html::EndTag("a")
- << html::EndTag("dt")
- << html::CR()
- << html::StartTag("dd")
+ << xml::EndTag("a")
+ << xml::EndTag("dt")
+ << xml::CR()
+ << xml::StartTag("dd")
<< ne.desc
- << html::EndTag("dd")
- << html::CR();
+ << xml::EndTag("dd")
+ << xml::CR();
}
- xs << html::EndTag("dl")
- << html::CR()
- << html::EndTag("div")
- << html::CR();
+ xs << xml::EndTag("dl")
+ << xml::CR()
+ << xml::EndTag("div")
+ << xml::CR();
return ods.str();
}
}
-// FIXME This should be changed to use the TOC. Perhaps
-// that could be done when XHTML output is added.
-int InsetPrintNomencl::docbook(odocstream & os, OutputParams const &) const
+void InsetPrintNomencl::docbook(XMLStream & xs, OutputParams const & runparams) const
{
- os << "<glossary>\n";
- int newlines = 2;
- InsetIterator it = inset_iterator_begin(buffer().inset());
- while (it) {
- if (it->lyxCode() == NOMENCL_CODE) {
- newlines += static_cast<InsetNomencl const &>(*it).docbookGlossary(os);
- ++it;
- } else if (!it->producesOutput()) {
- // Ignore contents of insets that are not in output
- size_t const depth = it.depth();
- ++it;
- while (it.depth() > depth)
- ++it;
- } else {
- ++it;
- }
+ shared_ptr<Toc const> toc = buffer().tocBackend().toc("nomencl");
+
+ EntryMap entries;
+ Toc::const_iterator it = toc->begin();
+ Toc::const_iterator const en = toc->end();
+ for (; it != en; ++it) {
+ DocIterator dit = it->dit();
+ Paragraph const & par = dit.innerParagraph();
+ Inset const * inset = par.getInset(dit.top().pos());
+ if (!inset)
+ return;
+ InsetCommand const * ic = inset->asInsetCommand();
+ if (!ic)
+ return;
+
+ // FIXME We need a link to the paragraph here, so we
+ // need some kind of struct.
+ docstring const symbol = ic->getParam("symbol");
+ docstring const desc = ic->getParam("description");
+ docstring const prefix = ic->getParam("prefix");
+ docstring const sortas = prefix.empty() ? symbol : prefix;
+
+ entries[sortas] = NomenclEntry(symbol, desc, &par);
}
- os << "</glossary>\n";
- return newlines;
+
+ if (entries.empty())
+ return;
+
+ // As opposed to XHTML, no need to defer everything until the end of time, so write directly to xs.
+ // TODO: At least, that's what was done before...
+
+ docstring toclabel = translateIfPossible(from_ascii("Nomenclature"),
+ getLocalOrDefaultLang(runparams)->lang());
+
+ xs << xml::StartTag("glossary");
+ xs << xml::CR();
+ xs << xml::StartTag("title");
+ xs << toclabel;
+ xs << xml::EndTag("title");
+ xs << xml::CR();
+
+ EntryMap::const_iterator eit = entries.begin();
+ EntryMap::const_iterator const een = entries.end();
+ for (; eit != een; ++eit) {
+ NomenclEntry const & ne = eit->second;
+
+ xs << xml::StartTag("glossentry", "xml:id=\"" + xml::cleanID(from_ascii("nomen") + ne.symbol) + "\"");
+ xs << xml::CR();
+ xs << xml::StartTag("glossterm");
+ xs << ne.symbol;
+ xs << xml::EndTag("glossterm");
+ xs << xml::CR();
+ xs << xml::StartTag("glossdef");
+ xs << xml::CR();
+ xs << xml::StartTag("para");
+ xs << ne.desc;
+ xs << xml::EndTag("para");
+ xs << xml::CR();
+ xs << xml::EndTag("glossdef");
+ xs << xml::CR();
+ xs << xml::EndTag("glossentry");
+ xs << xml::CR();
+ }
+
+ xs << xml::EndTag("glossary");
+ xs << xml::CR();
}
int w = 0;
docstring symb;
- InsetNomencl const * nomencl = 0;
+ InsetNomencl const * nomencl = nullptr;
ParagraphList::const_iterator it = buffer.paragraphs().begin();
ParagraphList::const_iterator end = buffer.paragraphs().end();
if (inset->lyxCode() != NOMENCL_CODE)
continue;
nomencl = static_cast<InsetNomencl const *>(inset);
- docstring const symbol =
- nomencl->getParam("symbol");
+ // Use proper formatting. We do not escape makeindex chars here
+ docstring symbol = nomencl ?
+ nomencl->params().prepareCommand(runparams, nomencl->getParam("symbol"),
+ ParamInfo::HANDLING_LATEXIFY)
+ : docstring();
+ // strip out % characters which are used as escape in nomencl
+ // but act as comment in our context here
+ symbol = subst(symbol, from_ascii("%"), docstring());
// This is only an approximation,
// but the best we can get.
int const wx = use_gui ?
}
}
// return the widest (or an empty) string
- if (symb.empty())
- return symb;
-
- // we have to encode the string properly
- pair<docstring, docstring> latex_symb =
- runparams.encoding->latexString(symb, runparams.dryrun);
- if (!latex_symb.second.empty())
- LYXERR0("Omitting uncodable characters '"
- << latex_symb.second
- << "' in nomencl widest string!");
- return latex_symb.first;
+ return symb;
}
-} // namespace anon
+} // namespace
void InsetPrintNomencl::latex(otexstream & os, OutputParams const & runparams_in) const
<< from_ascii(getCmdName())
<< '['
<< from_ascii(width)
- << "]{}";
+ << "]"
+ << termcmd;
return;
}
// output the command \printnomenclature
void InsetPrintNomencl::validate(LaTeXFeatures & features) const
{
+ features.useInsetLayout(getLayout());
features.require("nomencl");
}
projects / lyx.git / blobdiff