X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetListings.cpp;h=1afa0f3612625d663e8500d65dbbcb5c3de9ce11;hb=858f6b6c7b630f7672001fb19b55109a89aed142;hp=32211bb0aac784aedcb4fc3055e934b9440c80f5;hpb=be468136df13bc705fec9a22f0d0fd52036afbe4;p=lyx.git diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp index 32211bb0aa..1afa0f3612 100644 --- 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" @@ -50,11 +51,8 @@ using namespace lyx::support; namespace lyx { -char const lstinline_delimiters[] = - "!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm"; - InsetListings::InsetListings(Buffer * buf, InsetListingsParams const & par) - : InsetCollapsable(buf) + : InsetCaptionable(buf,"listing") { status_ = par.status(); } @@ -72,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"; @@ -100,7 +82,7 @@ void InsetListings::write(ostream & os) const os << "inline true\n"; else os << "inline false\n"; - InsetCollapsable::write(os); + InsetCaptionable::write(os); } @@ -122,7 +104,7 @@ void InsetListings::read(Lexer & lex) break; } } - InsetCollapsable::read(lex); + InsetCaptionable::read(lex); } @@ -141,13 +123,18 @@ 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 = (runparams.local_font != 0) ? runparams.local_font->language() @@ -156,7 +143,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const // language; if not, fall back to latin1. Encoding const * const lstenc = (outer_language->encoding()->hasFixedWidth()) ? - outer_language->encoding() + outer_language->encoding() : encodings.fromLyXName("iso8859-1"); switchEncoding(os.os(), buffer().params(), runparams, *lstenc, true); runparams.encoding = lstenc; @@ -183,15 +170,15 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const + _("uncodable character") + " '"; code += docstring(1, c); code += "'>"; - } else + } else uncodable += c; } catch (EncodingException & /* e */) { - if (runparams.dryrun) { + if (runparams.dryrun) { code += "<" + _("LyX Warning: ") + _("uncodable character") + " '"; code += docstring(1, c); code += "'>"; - } else + } else uncodable += c; } } @@ -202,17 +189,18 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const code += "\n"; } if (isInline) { - char const * delimiter = lstinline_delimiters; - for (; delimiter != '\0'; ++delimiter) - if (!contains(code, *delimiter)) - break; + static const docstring delimiters = + from_utf8("!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm"); + + size_t pos = delimiters.find_first_not_of(code); + // This code piece contains all possible special character? !!! // Replace ! with a warning message and use ! as delimiter. - if (*delimiter == '\0') { + if (pos == string::npos) { docstring delim_error = "<" + _("LyX Warning: ") + _("no more lstline delimiters available") + ">"; code = subst(code, from_ascii("!"), delim_error); - delimiter = lstinline_delimiters; + pos = 0; if (!runparams.dryrun && !runparams.silent) { // FIXME: warning should be passed to the error dialog frontend::Alert::warning(_("Running out of delimiters"), @@ -223,12 +211,14 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const "must investigate!")); } } - if (param_string.empty()) - os << "\\lstinline" << *delimiter; - else - os << "\\lstinline[" << from_utf8(param_string) << "]" << *delimiter; - os << code - << *delimiter; + docstring const delim(1, delimiters[pos]); + os << "\\lstinline"; + if (!param_string.empty()) + os << "[" << from_utf8(param_string) << "]"; + else if (pos >= delimiters.find('Q')) + // We need to terminate the command before the delimiter + os << " "; + os << delim << code << delim; } else { OutputParams rp = runparams; rp.moving_arg = true; @@ -256,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)); } } @@ -270,19 +270,19 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const XHTMLStream out(ods); bool const isInline = params().isInline(); - if (isInline) + if (isInline) out << html::CompTag("br"); else { out << html::StartTag("div", "class='float float-listings'"); docstring caption = getCaptionHTML(rp); if (!caption.empty()) - out << html::StartTag("div", "class='float-caption'") + out << html::StartTag("div", "class='float-caption'") << XHTMLStream::ESCAPE_NONE << caption << html::EndTag("div"); } InsetLayout const & il = getLayout(); - string const tag = il.htmltag(); + string const & tag = il.htmltag(); string attr = "class ='listings"; string const lang = params().getParamValue("language"); if (!lang.empty()) @@ -322,7 +322,7 @@ void InsetListings::doDispatch(Cursor & cur, FuncRequest & cmd) switch (cmd.action()) { case LFUN_INSET_MODIFY: { - cur.recordUndoInset(ATOMIC_UNDO, this); + cur.recordUndoInset(this); InsetListings::string2params(to_utf8(cmd.argument()), params()); break; } @@ -332,7 +332,7 @@ void InsetListings::doDispatch(Cursor & cur, FuncRequest & cmd) break; default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCaptionable::doDispatch(cur, cmd); break; } } @@ -347,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); } } @@ -374,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); } @@ -395,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(); @@ -414,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)); }