Revert "Do not crash is release mode if we stumble across an unrealized font."

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

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 97cb04ad7eddb49109f7c93359a93fec1ff503b0..1afa0f3612625d663e8500d65dbbcb5c3de9ce11 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -30,6 +30,7 @@
 #include "output_xhtml.h"
 #include "OutputParams.h"
 #include "TextClass.h"
+#include "texstream.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -51,7 +52,7 @@ namespace lyx {
 
 
 InsetListings::InsetListings(Buffer * buf, InsetListingsParams const & par)
-       : InsetCollapsable(buf)
+       : InsetCaptionable(buf,"listing")
 {
        status_ = par.status();
 }
@@ -69,22 +70,6 @@ Inset::DisplayType InsetListings::display() const
 }
 
 
-void InsetListings::updateBuffer(ParIterator const & it, UpdateType utype)
-{
-       Counters & cnts =
-               buffer().masterBuffer()->params().documentClass().counters();
-       string const saveflt = cnts.current_float();
-
-       // Tell to captions what the current float is
-       cnts.current_float("listing");
-
-       InsetCollapsable::updateBuffer(it, utype);
-
-       //reset afterwards
-       cnts.current_float(saveflt);
-}
-
-
 void InsetListings::write(ostream & os) const
 {
        os << "listings" << "\n";
@@ -97,7 +82,7 @@ void InsetListings::write(ostream & os) const
                os << "inline true\n";
        else
                os << "inline false\n";
-       InsetCollapsable::write(os);
+       InsetCaptionable::write(os);
 }
 
 
@@ -119,7 +104,7 @@ void InsetListings::read(Lexer & lex)
                        break;
                }
        }
-       InsetCollapsable::read(lex);
+       InsetCaptionable::read(lex);
 }
 
 
@@ -138,13 +123,16 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
 
        bool encoding_switched = false;
        Encoding const * const save_enc = runparams.encoding;
-
-       if (!runparams.isFullUnicode()
-           && !runparams.encoding->hasFixedWidth()) {
-               // We need to switch to a singlebyte encoding, since the
-               // listings package cannot deal with multi-byte-encoded
-               // glyphs (not needed with full-unicode aware backends
-               // such as XeTeX).
+       // The listings package cannot deal with multi-byte-encoded
+       // glyphs, except if full-unicode aware backends
+       // such as XeTeX or LuaTeX are used, and with pLaTeX.
+       bool const multibyte_possible = runparams.isFullUnicode()
+           || (buffer().params().encoding().package() == Encoding::japanese
+               && runparams.encoding->package() == Encoding::japanese);
+
+       if (!multibyte_possible && !runparams.encoding->hasFixedWidth()) {
+               // We need to switch to a singlebyte encoding, due to
+               // the restrictions of the listings package (see above).
                // This needs to be consistent with
                // LaTeXFeatures::getTClassI18nPreamble().
                Language const * const outer_language =
@@ -258,10 +246,20 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
        if (!uncodable.empty() && !runparams.silent) {
                // issue a warning about omitted characters
                // FIXME: should be passed to the error dialog
-               frontend::Alert::warning(_("Uncodable characters in listings inset"),
-                       bformat(_("The following characters in one of the program listings are\n"
-                                 "not representable in the current encoding and have been omitted:\n%1$s."),
-                       uncodable));
+               if (!multibyte_possible && !runparams.encoding->hasFixedWidth())
+                       frontend::Alert::warning(_("Uncodable characters in listings inset"),
+                               bformat(_("The following characters in one of the program listings are\n"
+                                         "not representable in the current encoding and have been omitted:\n%1$s.\n"
+                                         "This is due to a restriction of the listings package, which does\n"
+                                         "not support your encoding '%2$s'.\n"
+                                         "Toggling 'Use non-TeX fonts' in Document > Settings...\n"
+                                         "might help."),
+                               uncodable, _(runparams.encoding->guiName())));
+               else
+                       frontend::Alert::warning(_("Uncodable characters in listings inset"),
+                               bformat(_("The following characters in one of the program listings are\n"
+                                         "not representable in the current encoding and have been omitted:\n%1$s."),
+                               uncodable));
        }
 }
 
@@ -334,7 +332,7 @@ void InsetListings::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        default:
-               InsetCollapsable::doDispatch(cur, cmd);
+               InsetCaptionable::doDispatch(cur, cmd);
                break;
        }
 }
@@ -349,13 +347,14 @@ bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd,
                        status.setEnabled(true);
                        return true;
                case LFUN_CAPTION_INSERT: {
-                       if (params().isInline()) {
+                       // the inset outputs at most one caption
+                       if (params().isInline() || getCaptionInset()) {
                                status.setEnabled(false);
                                return true;
                        }
                }
                default:
-                       return InsetCollapsable::getStatus(cur, cmd, status);
+                       return InsetCaptionable::getStatus(cur, cmd, status);
        }
 }
 
@@ -376,7 +375,7 @@ void InsetListings::validate(LaTeXFeatures & features) const
        string param_string = params().params();
        if (param_string.find("\\color") != string::npos)
                features.require("color");
-       InsetCollapsable::validate(features);
+       InsetCaptionable::validate(features);
 }
 
 
@@ -397,11 +396,14 @@ docstring InsetListings::getCaption(OutputParams const & runparams) const
        if (ins == 0)
                return docstring();
 
-       TexRow texrow;
        odocstringstream ods;
-       otexstream os(ods, texrow);
+       otexstream os(ods, false);
        ins->getArgs(os, runparams);
        ins->getArgument(os, runparams);
+
+       // TODO: The code below should be moved to support, and then the test
+       //       in ../tests should be moved there as well.
+
        // the caption may contain \label{} but the listings
        // package prefer caption={}, label={}
        docstring cap = ods.str();
@@ -416,7 +418,7 @@ docstring InsetListings::getCaption(OutputParams const & runparams) const
        //
        // NOTE that } is not allowed in blah2.
        regex const reg("(.*)\\\\label\\{(.*?)\\}(.*)");
-       string const new_cap("\\1\\3},label={\\2");
+       string const new_cap("$1$3},label={$2");
        return from_utf8(regex_replace(to_utf8(cap), reg, new_cap));
 }