}
-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
(outer_language->encoding()->hasFixedWidth()) ?
outer_language->encoding()
: encodings.fromLyXName("iso8859-1");
- pair<bool, int> const c = switchEncoding(os, buffer().params(),
- runparams, *lstenc, true);
+ pair<bool, int> const c = switchEncoding(os.os(),
+ buffer().params(), runparams, *lstenc, true);
runparams.encoding = lstenc;
encoding_switched = true;
}
++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;
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);
+ pair<bool, int> const c = switchEncoding(os.os(),
+ buffer().params(), runparams, *save_enc, true);
runparams.encoding = save_enc;
}
"not representable in the current encoding and have been omitted:\n%1$s."),
uncodable));
}
-
- return lines;
}
switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
+ cur.recordUndoInset(ATOMIC_UNDO, this);
InsetListings::string2params(to_utf8(cmd.argument()), params());
break;
}
if (ins == 0)
return docstring();
+ TexRow texrow;
odocstringstream ods;
- ins->getOptArg(ods, runparams);
- ins->getArgument(ods, runparams);
+ otexstream os(ods, texrow);
+ ins->getOptArg(os, runparams);
+ ins->getArgument(os, runparams);
// the caption may contain \label{} but the listings
// package prefer caption={}, label={}
docstring cap = ods.str();