Rename XHTMLStream to XMLStream, move it to another file, and prepare for DocBook...

[features.git] / src / insets / InsetNomencl.cpp

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 74d1387599290e43762a6ce4726a41ec5bf8d368..5e8813c39840ad1e658320c64d641763aa337fe9 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -30,7 +30,7 @@
 #include "LyX.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
-#include "sgml.h"
+#include "xml.h"
 #include "texstream.h"
 #include "TocBackend.h"
 
@@ -55,7 +55,7 @@ namespace lyx {
 
 InsetNomencl::InsetNomencl(Buffer * buf, InsetCommandParams const & p)
        : InsetCommand(buf, p),
-         nomenclature_entry_id(sgml::uniqueID(from_ascii("nomen")))
+         nomenclature_entry_id(xml::uniqueID(from_ascii("nomen")))
 {}
 
 
@@ -65,9 +65,11 @@ ParamInfo const & InsetNomencl::findInfo(string const & /* cmdName */)
        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_;
@@ -106,13 +108,13 @@ int InsetNomencl::plaintext(odocstringstream & os,
 int InsetNomencl::docbook(odocstream & os, OutputParams const &) const
 {
        os << "<glossterm linkend=\"" << nomenclature_entry_id << "\">"
-          << sgml::escapeString(getParam("symbol"))
+          << xml::escapeString(getParam("symbol"))
           << "</glossterm>";
        return 0;
 }
 
 
-docstring InsetNomencl::xhtml(XHTMLStream &, OutputParams const &) const
+docstring InsetNomencl::xhtml(XMLStream &, OutputParams const &) const
 {
        return docstring();
 }
@@ -122,10 +124,10 @@ int InsetNomencl::docbookGlossary(odocstream & os) const
 {
        os << "<glossentry id=\"" << nomenclature_entry_id << "\">\n"
           << "<glossterm>"
-          << sgml::escapeString(getParam("symbol"))
+          << xml::escapeString(getParam("symbol"))
           << "</glossterm>\n"
           << "<glossdef><para>"
-          << sgml::escapeString(getParam("description"))
+          << xml::escapeString(getParam("description"))
           << "</para></glossdef>\n"
           <<"</glossentry>\n";
        return 4;
@@ -198,7 +200,7 @@ struct NomenclEntry {
 typedef map<docstring, NomenclEntry > EntryMap;
 
 
-docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const & op) const
+docstring InsetPrintNomencl::xhtml(XMLStream &, OutputParams const & op) const
 {
        shared_ptr<Toc const> toc = buffer().tocBackend().toc("nomencl");
 
@@ -232,42 +234,42 @@ docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const & op) const
        // 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'")
+       xs << xml::StartTag("div", "class='nomencl'")
+          << xml::StartTag(tag, "class='nomencl'")
                 << toclabel
-                << html::EndTag(tag)
-          << html::CR()
-          << html::StartTag("dl")
-          << html::CR();
+                << 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();
 }
@@ -362,8 +364,11 @@ docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
                        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 const symbol = nomencl ?
+                               nomencl->params().prepareCommand(runparams, nomencl->getParam("symbol"),
+                                                       ParamInfo::HANDLING_LATEXIFY)
+                               : docstring();
                        // This is only an approximation,
                        // but the best we can get.
                        int const wx = use_gui ?
@@ -376,19 +381,9 @@ docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
                }
        }
        // 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
@@ -422,6 +417,7 @@ void InsetPrintNomencl::latex(otexstream & os, OutputParams const & runparams_in
 
 void InsetPrintNomencl::validate(LaTeXFeatures & features) const
 {
+       features.useInsetLayout(getLayout());
        features.require("nomencl");
 }