}
-int InsetListings::latex(otexstream & 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.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;
OutputParams rp = runparams;
rp.moving_arg = true;
docstring const caption = getCaption(rp);
- // clear counter
- os.countLines();
if (param_string.empty() && caption.empty())
os << breakln << "\\begin{lstlisting}\n";
else {
os << from_utf8(param_string) << "]\n";
}
os << code << breakln << "\\end{lstlisting}\n";
- lines += os.countLines();
}
if (encoding_switched){
// Switch back
- pair<bool, int> const c = switchEncoding(os.os(),
- buffer().params(), runparams, *save_enc, true);
+ 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;
}
}
-docstring InsetListings::contextMenuName() const
+string InsetListings::contextMenuName() const
{
- return from_ascii("context-listings");
+ return "context-listings";
}
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;
- otexstream os(ods);
- ins->getOptArg(os, 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={}