X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNomencl.cpp;h=f75ef15cd5eb6f5b612489d3d03c8c8eb171ec1a;hb=667560114752e668fbd59123faf9d454da632fb0;hp=a32191b78aa595ee79a6482d8c5723e6c92e04db;hpb=8995a8387a03361b6a7ff44b447a90a6187b1a14;p=lyx.git

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index a32191b78a..f75ef15cd5 100644
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -24,15 +24,18 @@
 #include "FuncStatus.h"
 #include "InsetIterator.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 "TocBackend.h"
 
 #include "frontends/FontMetrics.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -72,12 +75,8 @@ ParamInfo const & InsetNomencl::findInfo(string const & /* cmdName */)
 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;
 }
 
@@ -129,6 +128,14 @@ void InsetNomencl::validate(LaTeXFeatures & features) const
 }
 
 
+void InsetNomencl::addToToc(DocIterator const & cpit, bool output_active,
+							UpdateType) const
+{
+	docstring const str = getParam("symbol");
+	buffer().tocBackend().toc("nomencl")->push_back(TocItem(cpit, 0, str, output_active));
+}
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // InsetPrintNomencl
@@ -163,6 +170,96 @@ docstring InsetPrintNomencl::screenLabel() const
 }
 
 
+struct NomenclEntry {
+	NomenclEntry() : par(0) {}
+	NomenclEntry(docstring s, docstring d, Paragraph const * p)
+	  : symbol(s), desc(d), par(p)
+	{}
+
+	docstring symbol;
+	docstring desc;
+	Paragraph const * par;
+};
+
+
+typedef map<docstring, NomenclEntry > EntryMap;
+
+
+docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const & op) const
+{
+	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 docstring();
+		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);
+	
+	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();
+	
+	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'")
+		   << ne.symbol
+		   << html::EndTag("a")
+		   << html::EndTag("dt")
+		   << html::CR()
+		   << html::StartTag("dd")
+		   << ne.desc
+		   << html::EndTag("dd")
+		   << html::CR();
+	}
+
+	xs << html::EndTag("dl")
+	   << html::CR()
+	   << html::EndTag("div")
+	   << html::CR();
+
+	return ods.str();
+}
+
+
 void InsetPrintNomencl::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action()) {
@@ -204,12 +301,6 @@ bool InsetPrintNomencl::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const &) const
-{
-	return docstring();
-}
-
-
 // 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
@@ -276,20 +367,13 @@ docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
 		return symb;
 
 	// we have to encode the string properly
-	docstring latex_symb;
-	for (size_t n = 0; n < symb.size(); ++n) {
-		try {
-			latex_symb += runparams.encoding->latexChar(symb[n]).first;
-		} catch (EncodingException & /* e */) {
-			if (runparams.dryrun) {
-				latex_symb += "<" + _("LyX Warning: ")
-					   + _("uncodable character") + " '";
-				latex_symb += docstring(1, symb[n]);
-				latex_symb += "'>";
-			}
-		}
-	}
-	return latex_symb;
+	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;
 }
 } // namespace anon