* Licence details can be found in the file COPYING.
*
* \author Bo Peng
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include "FuncRequest.h"
#include "FuncStatus.h"
#include "InsetCaption.h"
-#include "InsetList.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";
-InsetListings::InsetListings(Buffer const & buf, InsetListingsParams const & par)
- : InsetCollapsable(buf, par.status())
-{}
+InsetListings::InsetListings(Buffer * buf, InsetListingsParams const & par)
+ : InsetCollapsable(buf)
+{
+ status_ = par.status();
+}
InsetListings::~InsetListings()
}
-void InsetListings::updateLabels(ParIterator const & it)
+void InsetListings::updateBuffer(ParIterator const & it, UpdateType utype)
{
- Counters & cnts = buffer().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);
+ InsetCollapsable::updateBuffer(it, utype);
//reset afterwards
cnts.current_float(saveflt);
}
-docstring InsetListings::editMessage() const
-{
- return _("Opened Listing Inset");
-}
-
-
-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 isInline = params().isInline();
+ 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
docstring code;
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"
OutputParams rp = runparams;
rp.moving_arg = true;
docstring const caption = getCaption(rp);
- runparams.encoding = rp.encoding;
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));
}
+}
+
+
+docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
+{
+ odocstringstream ods;
+ XHTMLStream out(ods);
+
+ bool const isInline = params().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'")
+ << XHTMLStream::ESCAPE_NONE
+ << caption << html::EndTag("div");
+ }
- return lines;
+ 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(tag);
+
+ if (isInline) {
+ out << html::CompTag("br");
+ // escaping will already have been done
+ os << XHTMLStream::ESCAPE_NONE << ods.str();
+ } else {
+ out << html::EndTag("div");
+ // In this case, this needs to be deferred, but we'll put it
+ // before anything the text itself deferred.
+ def = ods.str() + '\n' + def;
+ }
+ return def;
}
-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;
}
+
case LFUN_INSET_DIALOG_UPDATE:
cur.bv().updateDialog("listings", params2string(params()));
break;
- case LFUN_TAB_INSERT:
- if (cur.selection()) {
- // If there is a selection, a tab is inserted at the
- // beginning of each paragraph.
- cur.recordUndoSelection();
- pit_type const pit_end = cur.selEnd().pit();
- for (pit_type pit = cur.selBegin().pit(); pit <= pit_end; pit++) {
- paragraphs()[pit].insertChar(0, '\t',
- buffer().params().trackChanges);
- // Update the selection pos to make sure the selection does not
- // change as the inserted tab will increase the logical pos.
- if (cur.anchor_.pit() == pit)
- cur.anchor_.forwardPos();
- if (cur.pit() == pit)
- cur.forwardPos();
- }
- cur.finishUndo();
- } else {
- // Maybe we shouldn't allow tabs within a line, because they
- // are not (yet) aligned as one might do expect.
- cur.recordUndo();
- cur.insert(from_ascii("\t"));
- cur.finishUndo();
- }
- break;
- case LFUN_TAB_DELETE:
- if (cur.selection()) {
- // If there is a selection, a tab (if present) is removed from
- // the beginning of each paragraph.
- cur.recordUndoSelection();
- pit_type const pit_end = cur.selEnd().pit();
- for (pit_type pit = cur.selBegin().pit(); pit <= pit_end; pit++) {
- Paragraph & par = paragraphs()[pit];
- if (par.getChar(0) == '\t') {
- if (cur.pit() == pit)
- cur.posBackward();
- if (cur.anchor_.pit() == pit && cur.anchor_.pos() > 0 )
- cur.anchor_.backwardPos();
-
- par.eraseChar(0, buffer().params().trackChanges);
- } else
- // If no tab was present, try to remove up to four spaces.
- for (int n_spaces = 0;
- par.getChar(0) == ' ' && n_spaces < 4; ++n_spaces) {
- if (cur.pit() == pit)
- cur.posBackward();
- if (cur.anchor_.pit() == pit && cur.anchor_.pos() > 0 )
- cur.anchor_.backwardPos();
-
- par.eraseChar(0, buffer().params().trackChanges);
- }
- }
- cur.finishUndo();
- } else {
- // If there is no selection, try to remove a tab or some spaces
- // before the position of the cursor.
- Paragraph & par = paragraphs()[cur.pit()];
- pos_type const pos = cur.pos();
- if (pos == 0)
- break;
-
- char_type const c = par.getChar(pos - 1);
- cur.recordUndo();
- if (c == '\t') {
- cur.posBackward();
- par.eraseChar(cur.pos(), buffer().params().trackChanges);
- } else
- for (int n_spaces = 0; cur.pos() > 0
- && par.getChar(cur.pos() - 1) == ' ' && n_spaces < 4;
- ++n_spaces) {
- cur.posBackward();
- par.eraseChar(cur.pos(), buffer().params().trackChanges);
- }
- cur.finishUndo();
- }
- break;
default:
InsetCollapsable::doDispatch(cur, cmd);
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_TAB_INSERT:
- case LFUN_TAB_DELETE:
- status.setEnabled(true);
+ case LFUN_CAPTION_INSERT: {
+ if (params().isInline()) {
+ status.setEnabled(false);
return true;
+ }
+ }
default:
return InsetCollapsable::getStatus(cur, cmd, status);
}
}
-void InsetListings::setButtonLabel()
+docstring const InsetListings::buttonLabel(BufferView const & bv) const
{
// FIXME UNICODE
if (decoration() == InsetLayout::CLASSIC)
- setLabel(isOpen() ? _("Listing") : getNewLabel(_("Listing")));
+ return isOpen(bv) ? _("Listing") : getNewLabel(_("Listing"));
else
- setLabel(getNewLabel(_("Listing")));
+ return getNewLabel(_("Listing"));
}
if (paragraphs().empty())
return docstring();
- ParagraphList::const_iterator pit = paragraphs().begin();
- for (; pit != paragraphs().end(); ++pit) {
- InsetList::const_iterator it = pit->insetList().begin();
- for (; it != pit->insetList().end(); ++it) {
- Inset & inset = *it->inset;
- if (inset.lyxCode() == CAPTION_CODE) {
- odocstringstream ods;
- InsetCaption * ins =
- static_cast<InsetCaption *>(it->inset);
- ins->getOptArg(ods, runparams);
- ins->getArgument(ods, runparams);
- // the caption may contain \label{} but the listings
- // package prefer caption={}, label={}
- docstring cap = ods.str();
- if (!contains(to_utf8(cap), "\\label{"))
- return cap;
- // convert from
- // blah1\label{blah2} blah3
- // to
- // blah1 blah3},label={blah2
- // to form options
- // caption={blah1 blah3},label={blah2}
- //
- // NOTE that } is not allowed in blah2.
- regex const reg("(.*)\\\\label\\{(.*?)\\}(.*)");
- string const new_cap("\\1\\3},label={\\2");
- return from_utf8(regex_replace(to_utf8(cap), reg, new_cap));
- }
- }
- }
- return docstring();
+ InsetCaption const * ins = getCaptionInset();
+ if (ins == 0)
+ return docstring();
+
+ TexRow texrow;
+ odocstringstream ods;
+ 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();
+ if (!contains(to_utf8(cap), "\\label{"))
+ return cap;
+ // convert from
+ // blah1\label{blah2} blah3
+ // to
+ // blah1 blah3},label={blah2
+ // to form options
+ // caption={blah1 blah3},label={blah2}
+ //
+ // NOTE that } is not allowed in blah2.
+ regex const reg("(.*)\\\\label\\{(.*?)\\}(.*)");
+ string const new_cap("\\1\\3},label={\\2");
+ return from_utf8(regex_replace(to_utf8(cap), reg, new_cap));
}
projects / lyx.git / blobdiff