Pure HTML output for math macros.

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

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index c5ebfa2c271429027dd46eb9caedec8c12ecf5de..57f38647d0d845ded7a2b7f25b962dc70abd7054 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -18,6 +18,7 @@
 #include "Buffer.h"
 #include "DispatchResult.h"
 #include "Font.h"
+#include "Encoding.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "InsetIterator.h"
@@ -25,7 +26,7 @@
 #include "LaTeXFeatures.h"
 #include "Length.h"
 #include "LyX.h"
-#include "MetricsInfo.h"
+#include "OutputParams.h"
 #include "output_xhtml.h"
 #include "sgml.h"
 
@@ -58,8 +59,10 @@ ParamInfo const & InsetNomencl::findInfo(string const & /* cmdName */)
        static ParamInfo param_info_;
        if (param_info_.empty()) {
                param_info_.add("prefix", ParamInfo::LATEX_OPTIONAL);
-               param_info_.add("symbol", ParamInfo::LATEX_REQUIRED);
-               param_info_.add("description", ParamInfo::LATEX_REQUIRED);
+               param_info_.add("symbol", ParamInfo::LATEX_REQUIRED,
+                               ParamInfo::HANDLING_LATEXIFY);
+               param_info_.add("description", ParamInfo::LATEX_REQUIRED,
+                               ParamInfo::HANDLING_LATEXIFY);
        }
        return param_info_;
 }
@@ -230,7 +233,7 @@ int InsetPrintNomencl::docbook(odocstream & os, OutputParams const &) const
 
 
 namespace {
-docstring nomenclWidest(Buffer const & buffer)
+docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
 {
        // nomenclWidest() determines and returns the widest used
        // nomenclature symbol in the document
@@ -265,16 +268,34 @@ docstring nomenclWidest(Buffer const & buffer)
                }
        }
        // return the widest (or an empty) string
-       return symb;
-}
+       if (symb.empty())
+               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]);
+               } catch (EncodingException & /* e */) {
+                       if (runparams.dryrun) {
+                               latex_symb += "<" + _("LyX Warning: ")
+                                          + _("uncodable character") + " '";
+                               latex_symb += docstring(1, symb[n]);
+                               latex_symb += "'>";
+                       }
+               }
+       }
+       return latex_symb;
 }
+} // namespace anon
 
 
 int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in) const
 {
+       OutputParams runparams = runparams_in;
        int lines = 0;
        if (getParam("set_width") == "auto") {
-               docstring widest = nomenclWidest(buffer());
+               docstring widest = nomenclWidest(buffer(), runparams);
                // Set the label width via nomencl's command \nomlabelwidth.
                // This must be output before the command \printnomenclature
                if (!widest.empty()) {
@@ -295,7 +316,6 @@ int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in)
                return lines;
        }
        // output the command \printnomenclature
-       OutputParams runparams = runparams_in;
        os << getCommand(runparams);
        return lines;
 }