Cocoa based Qt-4.6 needs to paint every character separately to match metrics computa...

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

diff --git a/src/insets/InsetNomencl.cpp b/src/insets/InsetNomencl.cpp
index 99e4c5dd6b4d866f948279109f27bec1a4d436e8..cd0a526ea0222f5fe36702627fa9c72febe18f01 100644 (file)
--- a/src/insets/InsetNomencl.cpp
+++ b/src/insets/InsetNomencl.cpp
@@ -16,6 +16,7 @@
 #include "InsetNote.h"
 
 #include "Buffer.h"
+#include "Cursor.h"
 #include "DispatchResult.h"
 #include "Font.h"
 #include "Encoding.h"
@@ -49,7 +50,7 @@ namespace lyx {
 /////////////////////////////////////////////////////////////////////
 
 InsetNomencl::InsetNomencl(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "nomenclature"),
+       : InsetCommand(buf, p),
          nomenclature_entry_id(sgml::uniqueID(from_ascii("nomen")))
 {}
 
@@ -135,7 +136,7 @@ void InsetNomencl::validate(LaTeXFeatures & features) const
 /////////////////////////////////////////////////////////////////////
 
 InsetPrintNomencl::InsetPrintNomencl(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "nomencl_print")
+       : InsetCommand(buf, p)
 {}
 
 
@@ -164,17 +165,18 @@ docstring InsetPrintNomencl::screenLabel() const
 
 void InsetPrintNomencl::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action_) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(NOMENCL_PRINT_CODE);
                // FIXME UNICODE
-               InsetCommand::string2params("nomencl_print",
-                       to_utf8(cmd.argument()), p);
+               InsetCommand::string2params(to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
-                       cur.noUpdate();
+                       cur.noScreenUpdate();
                        break;
                }
+
+               cur.recordUndo();
                setParams(p);
                break;
        }
@@ -189,7 +191,7 @@ void InsetPrintNomencl::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetPrintNomencl::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
-       switch (cmd.action_) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_DIALOG_UPDATE:
        case LFUN_INSET_MODIFY:
@@ -208,6 +210,8 @@ docstring InsetPrintNomencl::xhtml(XHTMLStream &, OutputParams const &) const
 }
 
 
+// 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
 {
        os << "<glossary>\n";
@@ -290,10 +294,9 @@ docstring nomenclWidest(Buffer const & buffer, OutputParams const & runparams)
 } // namespace anon
 
 
-int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetPrintNomencl::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams = runparams_in;
-       int lines = 0;
        if (getParam("set_width") == "auto") {
                docstring widest = nomenclWidest(buffer(), runparams);
                // Set the label width via nomencl's command \nomlabelwidth.
@@ -302,7 +305,6 @@ int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in)
                        os << "\\settowidth{\\nomlabelwidth}{"
                           << widest
                           << "}\n";
-                       ++lines;
                }
        } else if (getParam("set_width") == "custom") {
                // custom length as optional arg of \printnomenclature
@@ -313,11 +315,10 @@ int InsetPrintNomencl::latex(odocstream & os, OutputParams const & runparams_in)
                   << '['
                   << from_ascii(width)
                   << "]{}";
-               return lines;
+               return;
        }
        // output the command \printnomenclature
        os << getCommand(runparams);
-       return lines;
 }
 
 
@@ -333,7 +334,7 @@ InsetCode InsetPrintNomencl::lyxCode() const
 }
 
 
-docstring InsetPrintNomencl::contextMenu(BufferView const &, int, int) const
+docstring InsetPrintNomencl::contextMenuName() const
 {
        return from_ascii("context-nomenclprint");
 }