#include "FuncStatus.h"
#include "InsetCaption.h"
#include "Language.h"
-#include "MetricsInfo.h"
+#include "LaTeXFeatures.h"
+#include "Lexer.h"
#include "output_latex.h"
#include "output_xhtml.h"
+#include "OutputParams.h"
#include "TextClass.h"
#include "support/debug.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
-#include <boost/regex.hpp>
+#include "support/regex.h"
#include <sstream>
namespace lyx {
-using boost::regex;
char const lstinline_delimiters[] =
"!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm";
}
-void InsetListings::updateLabels(ParIterator const & it, bool out)
+void InsetListings::updateBuffer(ParIterator const & it, UpdateType utype)
{
- Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
+ 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::updateLabels(it, out);
+ InsetCollapsable::updateBuffer(it, utype);
//reset afterwards
cnts.current_float(saveflt);
}
-int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
+void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
{
string param_string = params().params();
// NOTE: I use {} to quote text, which is an experimental feature
// of the listings package (see page 25 of the manual)
- int lines = 0;
bool const isInline = params().isInline();
// get the paragraphs. We can not output them directly to given odocstream
// because we can not yet determine the delimiter character of \lstinline
bool encoding_switched = false;
Encoding const * const save_enc = runparams.encoding;
- if (!runparams.encoding->hasFixedWidth()) {
- // We need to switch to a singlebyte encoding, since the listings
- // package cannot deal with multiple-byte-encoded glyphs
+ 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).
Language const * const outer_language =
(runparams.local_font != 0) ?
runparams.local_font->language()
(outer_language->encoding()->hasFixedWidth()) ?
outer_language->encoding()
: encodings.fromLyXName("iso8859-1");
- pair<bool, int> const c = switchEncoding(os, buffer().params(),
- runparams, *lstenc, true);
+ switchEncoding(os.os(), buffer().params(), runparams, *lstenc, true);
runparams.encoding = lstenc;
encoding_switched = true;
}
// we can only output characters covered by the current
// encoding!
try {
- if (runparams.encoding->latexChar(c) == docstring(1, c))
+ if (runparams.encoding->encodable(c))
code += c;
else if (runparams.dryrun) {
code += "<" + _("LyX Warning: ")
++par;
// for the inline case, if there are multiple paragraphs
// they are simply joined. Otherwise, expect latex errors.
- if (par != end && !isInline && !captionline) {
+ if (par != end && !isInline && !captionline)
code += "\n";
- ++lines;
- }
}
if (isInline) {
char const * delimiter = lstinline_delimiters;
+ _("no more lstline delimiters available") + ">";
code = subst(code, from_ascii("!"), delim_error);
delimiter = lstinline_delimiters;
- if (!runparams.dryrun) {
+ if (!runparams.dryrun && !runparams.silent) {
// FIXME: warning should be passed to the error dialog
frontend::Alert::warning(_("Running out of delimiters"),
_("For inline program listings, one character must be reserved\n"
rp.moving_arg = true;
docstring const caption = getCaption(rp);
if (param_string.empty() && caption.empty())
- os << "\n\\begin{lstlisting}\n";
+ os << breakln << "\\begin{lstlisting}\n";
else {
- os << "\n\\begin{lstlisting}[";
+ os << breakln << "\\begin{lstlisting}[";
if (!caption.empty()) {
os << "caption={" << caption << '}';
if (!param_string.empty())
}
os << from_utf8(param_string) << "]\n";
}
- lines += 2;
- os << code << "\n\\end{lstlisting}\n";
- lines += 2;
+ os << code << breakln << "\\end{lstlisting}\n";
}
if (encoding_switched){
// Switch back
- pair<bool, int> const c = switchEncoding(os, buffer().params(),
- runparams, *save_enc, true);
+ switchEncoding(os.os(), buffer().params(), runparams, *save_enc, true);
runparams.encoding = save_enc;
}
- if (!uncodable.empty()) {
+ 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"),
"not representable in the current encoding and have been omitted:\n%1$s."),
uncodable));
}
-
- return lines;
}
docstring caption = getCaptionHTML(rp);
if (!caption.empty())
out << html::StartTag("div", "class='float-caption'")
+ << XHTMLStream::ESCAPE_NONE
<< caption << html::EndTag("div");
}
- out << html::StartTag("pre");
+ InsetLayout const & il = getLayout();
+ string const tag = il.htmltag();
+ string attr = "class ='listings";
+ string const lang = params().getParamValue("language");
+ if (!lang.empty())
+ attr += " " + lang;
+ attr += "'";
+ out << html::StartTag(tag, attr);
OutputParams newrp = rp;
newrp.html_disable_captions = true;
+ // We don't want to convert dashes here. That's the only conversion we
+ // do for XHTML, so this is safe.
+ newrp.pass_thru = true;
docstring def = InsetText::insetAsXHTML(out, newrp, InsetText::JustText);
- out << html::EndTag("pre");
+ out << html::EndTag(tag);
if (isInline) {
out << html::CompTag("br");
// escaping will already have been done
- os << XHTMLStream::NextRaw() << ods.str();
+ os << XHTMLStream::ESCAPE_NONE << ods.str();
} else {
out << html::EndTag("div");
// In this case, this needs to be deferred, but we'll put it
}
-docstring InsetListings::contextMenu(BufferView const &, int, int) const
+string InsetListings::contextMenuName() const
{
- return from_ascii("context-listings");
+ return "context-listings";
}
void InsetListings::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
+ cur.recordUndoInset(ATOMIC_UNDO, this);
InsetListings::string2params(to_utf8(cmd.argument()), params());
break;
}
bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & status) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_MODIFY:
case LFUN_INSET_DIALOG_UPDATE:
status.setEnabled(true);
return true;
- case LFUN_CAPTION_INSERT:
- status.setEnabled(!params().isInline());
- return true;
+ case LFUN_CAPTION_INSERT: {
+ if (params().isInline()) {
+ status.setEnabled(false);
+ return true;
+ }
+ }
default:
return InsetCollapsable::getStatus(cur, cmd, status);
}
if (ins == 0)
return docstring();
+ TexRow texrow;
odocstringstream ods;
- ins->getOptArg(ods, runparams);
- ins->getArgument(ods, runparams);
+ otexstream os(ods, texrow);
+ ins->getArgs(os, runparams);
+ ins->getArgument(os, runparams);
// the caption may contain \label{} but the listings
// package prefer caption={}, label={}
docstring cap = ods.str();
projects / lyx.git / blobdiff