Fix encoding issues in bibitems (bug #6534)

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

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index ded2b8b9cca3507daafad96b1476f9b426c9b5e7..fc158a02334c3ef7c14263e24cc1aa1fa380becf 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -20,12 +20,14 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "DispatchResult.h"
+#include "Encoding.h"
 #include "FuncRequest.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h" 
 #include "Lexer.h"
 #include "output_xhtml.h"
+#include "OutputParams.h"
 #include "Paragraph.h"
 #include "ParagraphList.h"
 #include "ParIterator.h"
@@ -34,6 +36,7 @@
 #include "frontends/alert.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -172,8 +175,48 @@ int InsetBibitem::plaintext(odocstream & os, OutputParams const &) const
 }
 
 
+int InsetBibitem::latex(odocstream & os, OutputParams const & runparams) const
+{
+       docstring cmd = '\\' + from_ascii(defaultCommand());
+       docstring uncodable;
+       if (!getParam("label").empty()) {
+               cmd += '[';
+               docstring orig = getParam("label");
+               for (size_t n = 0; n < orig.size(); ++n) {
+                       try {
+                               cmd += runparams.encoding->latexChar(orig[n]);
+                       } catch (EncodingException & /* e */) {
+                               LYXERR0("Uncodable character in bibitem!");
+                               if (runparams.dryrun) {
+                                       cmd += "<" + _("LyX Warning: ")
+                                           + _("uncodable character") + " '";
+                                       cmd += docstring(1, orig[n]);
+                                       cmd += "'>";
+                               } else
+                                       uncodable += orig[n];
+                       }
+               }
+               cmd += ']';
+       }
+       cmd += '{' + escape(getParam("key")) + '}';
+
+       os << cmd;
+
+       if (!uncodable.empty()) {
+               // issue a warning about omitted characters
+               // FIXME: should be passed to the error dialog
+               frontend::Alert::warning(_("Uncodable characters in bibliography item"),
+                       bformat(_("The following characters in one of the bibliography items are\n"
+                                 "not representable in the current encoding and have been omitted:\n%1$s."),
+                       uncodable));
+       }
+       
+       return 0;
+}
+
+
 // ale070405
-docstring bibitemWidest(Buffer const & buffer)
+docstring bibitemWidest(Buffer const & buffer, OutputParams const & runparams)
 {
        int w = 0;
 
@@ -234,8 +277,22 @@ docstring bibitemWidest(Buffer const & buffer)
                }
        }
 
-       if (!lbl.empty())
-               return lbl;
+       if (!lbl.empty()) {
+               docstring latex_lbl;
+               for (size_t n = 0; n < lbl.size(); ++n) {
+                       try {
+                               latex_lbl += runparams.encoding->latexChar(lbl[n]);
+                       } catch (EncodingException & /* e */) {
+                               if (runparams.dryrun) {
+                                       latex_lbl += "<" + _("LyX Warning: ")
+                                                 + _("uncodable character") + " '";
+                                       latex_lbl += docstring(1, lbl[n]);
+                                       latex_lbl += "'>";
+                               }
+                       }
+               }
+               return latex_lbl;
+       }
 
        return from_ascii("99");
 }