2002-09-25 14:26:13 +00:00
|
|
|
/**
|
2007-04-25 01:24:38 +00:00
|
|
|
* \file InsetInclude.cpp
|
2002-09-25 14:26:13 +00:00
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
*
|
2008-11-14 15:58:50 +00:00
|
|
|
* \author Lars Gullik Bjønnes
|
2007-10-23 18:51:04 +00:00
|
|
|
* \author Richard Heck (conversion to InsetCommand)
|
2002-09-25 14:26:13 +00:00
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
* Full author contact details are available in file CREDITS.
|
2002-09-25 14:26:13 +00:00
|
|
|
*/
|
1999-09-27 18:44:28 +00:00
|
|
|
|
2003-05-13 09:48:57 +00:00
|
|
|
#include <config.h>
|
1999-09-27 18:44:28 +00:00
|
|
|
|
2007-04-25 01:24:38 +00:00
|
|
|
#include "InsetInclude.h"
|
2003-09-05 09:01:27 +00:00
|
|
|
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Buffer.h"
|
2003-06-20 12:46:28 +00:00
|
|
|
#include "buffer_funcs.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "BufferList.h"
|
|
|
|
#include "BufferParams.h"
|
2001-06-25 00:06:33 +00:00
|
|
|
#include "BufferView.h"
|
2007-04-26 14:56:30 +00:00
|
|
|
#include "Cursor.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "DispatchResult.h"
|
2008-03-06 18:13:04 +00:00
|
|
|
#include "ErrorList.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "Exporter.h"
|
2008-04-27 18:03:21 +00:00
|
|
|
#include "Format.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "FuncRequest.h"
|
2005-04-22 08:57:22 +00:00
|
|
|
#include "FuncStatus.h"
|
2003-03-05 14:59:37 +00:00
|
|
|
#include "LaTeXFeatures.h"
|
2008-06-18 18:54:31 +00:00
|
|
|
#include "LayoutFile.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "LyX.h"
|
2008-04-27 18:03:21 +00:00
|
|
|
#include "LyXFunc.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "LyXRC.h"
|
2007-04-26 11:30:54 +00:00
|
|
|
#include "Lexer.h"
|
2007-04-26 04:41:58 +00:00
|
|
|
#include "MetricsInfo.h"
|
|
|
|
#include "OutputParams.h"
|
2007-11-07 23:25:08 +00:00
|
|
|
#include "TextClass.h"
|
2008-02-15 14:30:08 +00:00
|
|
|
#include "TocBackend.h"
|
2001-12-28 13:26:54 +00:00
|
|
|
|
2007-04-28 20:44:46 +00:00
|
|
|
#include "frontends/alert.h"
|
2002-08-01 17:28:59 +00:00
|
|
|
#include "frontends/Painter.h"
|
2001-12-28 13:26:54 +00:00
|
|
|
|
2004-04-19 13:05:36 +00:00
|
|
|
#include "graphics/PreviewImage.h"
|
2003-10-10 21:08:55 +00:00
|
|
|
#include "graphics/PreviewLoader.h"
|
|
|
|
|
2008-03-07 13:33:33 +00:00
|
|
|
#include "insets/InsetLabel.h"
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
#include "insets/InsetListingsParams.h"
|
2008-03-07 13:33:33 +00:00
|
|
|
#include "insets/RenderPreview.h"
|
2003-09-05 09:01:27 +00:00
|
|
|
|
2008-06-18 18:54:31 +00:00
|
|
|
#include "support/convert.h"
|
2008-02-15 14:30:08 +00:00
|
|
|
#include "support/debug.h"
|
2007-11-01 22:17:22 +00:00
|
|
|
#include "support/docstream.h"
|
2007-12-05 10:32:49 +00:00
|
|
|
#include "support/FileNameList.h"
|
2003-09-05 09:01:27 +00:00
|
|
|
#include "support/filetools.h"
|
2008-02-15 14:30:08 +00:00
|
|
|
#include "support/gettext.h"
|
2008-06-18 18:54:31 +00:00
|
|
|
#include "support/lassert.h"
|
2003-05-13 14:36:24 +00:00
|
|
|
#include "support/lstrings.h" // contains
|
2006-10-11 19:40:50 +00:00
|
|
|
#include "support/lyxalgo.h"
|
2001-12-28 13:26:54 +00:00
|
|
|
|
2002-08-06 14:02:59 +00:00
|
|
|
#include <boost/bind.hpp>
|
|
|
|
|
2007-12-12 10:16:00 +00:00
|
|
|
using namespace std;
|
2007-12-12 18:57:56 +00:00
|
|
|
using namespace lyx::support;
|
2006-10-21 00:16:43 +00:00
|
|
|
|
|
|
|
namespace lyx {
|
2007-09-16 10:36:57 +00:00
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
namespace Alert = frontend::Alert;
|
2000-03-28 02:18:55 +00:00
|
|
|
|
2002-08-01 17:28:59 +00:00
|
|
|
|
2001-03-20 01:22:46 +00:00
|
|
|
namespace {
|
1999-09-27 18:44:28 +00:00
|
|
|
|
2006-10-21 19:40:29 +00:00
|
|
|
docstring const uniqueID()
|
2001-03-23 17:09:34 +00:00
|
|
|
{
|
2000-09-26 13:54:57 +00:00
|
|
|
static unsigned int seed = 1000;
|
2006-10-21 19:40:29 +00:00
|
|
|
return "file" + convert<docstring>(++seed);
|
2000-07-02 09:52:44 +00:00
|
|
|
}
|
|
|
|
|
2007-05-18 14:40:39 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
/// the type of inclusion
|
|
|
|
enum Types {
|
2007-10-25 04:13:56 +00:00
|
|
|
INCLUDE, VERB, INPUT, VERBAST, LISTINGS, NONE
|
2007-10-23 15:02:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2007-12-12 19:28:07 +00:00
|
|
|
Types type(string const & s)
|
2007-11-03 17:37:37 +00:00
|
|
|
{
|
2007-10-25 04:13:56 +00:00
|
|
|
if (s == "input")
|
2007-10-23 15:02:15 +00:00
|
|
|
return INPUT;
|
2007-10-25 04:13:56 +00:00
|
|
|
if (s == "verbatiminput")
|
2007-10-23 15:02:15 +00:00
|
|
|
return VERB;
|
2007-10-25 04:13:56 +00:00
|
|
|
if (s == "verbatiminput*")
|
2007-10-23 15:02:15 +00:00
|
|
|
return VERBAST;
|
2007-10-25 04:13:56 +00:00
|
|
|
if (s == "lstinputlisting")
|
2007-10-23 15:02:15 +00:00
|
|
|
return LISTINGS;
|
2007-10-25 04:13:56 +00:00
|
|
|
if (s == "include")
|
|
|
|
return INCLUDE;
|
|
|
|
return NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Types type(InsetCommandParams const & params)
|
|
|
|
{
|
2007-11-03 17:37:37 +00:00
|
|
|
return type(params.getCmdName());
|
2007-10-23 15:02:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-05-18 14:40:39 +00:00
|
|
|
bool isListings(InsetCommandParams const & params)
|
|
|
|
{
|
2007-10-23 15:02:15 +00:00
|
|
|
return type(params) == LISTINGS;
|
2007-05-18 14:40:39 +00:00
|
|
|
}
|
|
|
|
|
2001-03-20 01:22:46 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
bool isVerbatim(InsetCommandParams const & params)
|
|
|
|
{
|
|
|
|
Types const t = type(params);
|
2007-10-23 18:51:04 +00:00
|
|
|
return t == VERB || t == VERBAST;
|
2007-10-23 15:02:15 +00:00
|
|
|
}
|
2000-07-02 09:52:44 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
|
|
|
|
bool isInputOrInclude(InsetCommandParams const & params)
|
2003-10-09 19:27:07 +00:00
|
|
|
{
|
2007-10-23 15:02:15 +00:00
|
|
|
Types const t = type(params);
|
2007-10-23 18:51:04 +00:00
|
|
|
return t == INPUT || t == INCLUDE;
|
2003-10-09 19:27:07 +00:00
|
|
|
}
|
2001-03-14 10:57:39 +00:00
|
|
|
|
2008-01-08 16:35:43 +00:00
|
|
|
|
|
|
|
FileName const masterFileName(Buffer const & buffer)
|
|
|
|
{
|
|
|
|
return buffer.masterBuffer()->fileName();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void add_preview(RenderMonitoredPreview &, InsetInclude const &, Buffer const &);
|
|
|
|
|
|
|
|
|
|
|
|
string const parentFilename(Buffer const & buffer)
|
|
|
|
{
|
|
|
|
return buffer.absFileName();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-04-18 03:11:06 +00:00
|
|
|
FileName const includedFilename(Buffer const & buffer,
|
2008-01-08 16:35:43 +00:00
|
|
|
InsetCommandParams const & params)
|
|
|
|
{
|
2008-04-18 03:11:06 +00:00
|
|
|
return makeAbsPath(to_utf8(params["filename"]),
|
2008-04-20 03:08:11 +00:00
|
|
|
onlyPath(parentFilename(buffer)));
|
2008-01-08 16:35:43 +00:00
|
|
|
}
|
|
|
|
|
2008-04-20 03:08:11 +00:00
|
|
|
|
2008-03-07 13:33:33 +00:00
|
|
|
InsetLabel * createLabel(docstring const & label_str)
|
|
|
|
{
|
|
|
|
if (label_str.empty())
|
|
|
|
return 0;
|
|
|
|
InsetCommandParams icp(LABEL_CODE);
|
|
|
|
icp["name"] = label_str;
|
|
|
|
return new InsetLabel(icp);
|
|
|
|
}
|
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
} // namespace anon
|
2001-03-14 10:57:39 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
|
|
|
|
InsetInclude::InsetInclude(InsetCommandParams const & p)
|
|
|
|
: InsetCommand(p, "include"), include_label(uniqueID()),
|
2008-03-07 13:33:33 +00:00
|
|
|
preview_(new RenderMonitoredPreview(this)), set_label_(false), label_(0)
|
2003-10-09 19:27:07 +00:00
|
|
|
{
|
2003-10-10 21:08:55 +00:00
|
|
|
preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
|
2008-03-07 13:33:33 +00:00
|
|
|
|
|
|
|
if (isListings(params())) {
|
|
|
|
InsetListingsParams listing_params(to_utf8(p["lstparams"]));
|
|
|
|
label_ = createLabel(from_utf8(listing_params.getParamValue("label")));
|
|
|
|
}
|
2003-10-09 19:27:07 +00:00
|
|
|
}
|
2003-06-12 08:52:36 +00:00
|
|
|
|
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
InsetInclude::InsetInclude(InsetInclude const & other)
|
|
|
|
: InsetCommand(other), include_label(other.include_label),
|
2008-03-07 13:33:33 +00:00
|
|
|
preview_(new RenderMonitoredPreview(this)), set_label_(false), label_(0)
|
1999-09-27 18:44:28 +00:00
|
|
|
{
|
2007-10-23 15:02:15 +00:00
|
|
|
preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
|
2008-03-07 13:33:33 +00:00
|
|
|
|
|
|
|
if (other.label_)
|
|
|
|
label_ = new InsetLabel(*other.label_);
|
2003-03-05 14:59:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-03-06 20:58:59 +00:00
|
|
|
InsetInclude::~InsetInclude()
|
|
|
|
{
|
2008-03-07 13:36:39 +00:00
|
|
|
delete label_;
|
2008-03-06 20:58:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-03-07 13:33:33 +00:00
|
|
|
void InsetInclude::setBuffer(Buffer & buffer)
|
|
|
|
{
|
2008-03-27 04:35:26 +00:00
|
|
|
InsetCommand::setBuffer(buffer);
|
2008-03-07 13:33:33 +00:00
|
|
|
if (label_)
|
|
|
|
label_->setBuffer(buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-23 22:01:02 +00:00
|
|
|
ParamInfo const & InsetInclude::findInfo(string const & /* cmdName */)
|
2007-10-25 04:13:56 +00:00
|
|
|
{
|
2007-11-30 22:16:02 +00:00
|
|
|
// FIXME
|
2007-11-03 17:37:37 +00:00
|
|
|
// This is only correct for the case of listings, but it'll do for now.
|
|
|
|
// In the other cases, this second parameter should just be empty.
|
2008-02-23 22:01:02 +00:00
|
|
|
static ParamInfo param_info_;
|
|
|
|
if (param_info_.empty()) {
|
Per Abdel's suggestion that we focus on bug-fixing at this point, this will be the last patch in this series for a bit. But I wanted to get this done before I forget what it is I was doing, so here it is.
The idea behind this patch is to make real key-value support for InsetCommand parameters possible. This should be particularly useful for the listings version of InsetInclude, though we would need some kind of UI for it before it would really be helpful. (See below for some thoughts.) This doesn't substantially change anything else, though some things do get re-arranged a bit.
Basically, the idea is this. First, we introduce a whole range of parameter types: Normal LaTeX optional and required parameters; ones for LyX's internal use (like embed); and finally, in connection with keyval, ones that represent keys and ones that represent optional and required arguments where the keyval stuff will appear. (I'm assuming here that there will always be exactly one of those, and that it will accept only keyval-type material.) The parameters themselves are stored in a map, so it's really only the output routines that need to care about the different types of parameters.
Regarding the frontend, it seems to me that something like the following would work:
(i) scan the parameter list for LATEX_KEY type parameters
(ii) the dialog will have a series of lines, each of which has a combo box listing the acceptable keys and a QLineEdit for entering its value, as well as a "delete" button of some sort for removing this key and its value
(iii) there should be an "add line" button to add a new line, activated only when all other lines are filled with values
Probably not even too hard.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23235 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-25 22:13:45 +00:00
|
|
|
param_info_.add("filename", ParamInfo::LATEX_REQUIRED);
|
|
|
|
param_info_.add("lstparams", ParamInfo::LATEX_OPTIONAL);
|
2008-02-23 22:01:02 +00:00
|
|
|
}
|
|
|
|
return param_info_;
|
2007-10-25 04:13:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-12-12 19:28:07 +00:00
|
|
|
bool InsetInclude::isCompatibleCommand(string const & s)
|
2007-11-03 17:37:37 +00:00
|
|
|
{
|
2007-10-25 04:13:56 +00:00
|
|
|
return type(s) != NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-04-26 14:56:30 +00:00
|
|
|
void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
|
2003-03-05 14:59:37 +00:00
|
|
|
{
|
2008-04-10 21:49:34 +00:00
|
|
|
LASSERT(&cur.buffer() == &buffer(), /**/);
|
2003-03-07 15:58:02 +00:00
|
|
|
switch (cmd.action) {
|
2003-05-16 07:44:00 +00:00
|
|
|
|
2008-04-27 18:03:21 +00:00
|
|
|
case LFUN_INSET_EDIT: {
|
|
|
|
editIncluded(to_utf8(params()["filename"]));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2003-03-07 15:58:02 +00:00
|
|
|
case LFUN_INSET_MODIFY: {
|
2007-10-19 17:22:55 +00:00
|
|
|
InsetCommandParams p(INCLUDE_CODE);
|
2008-04-27 15:49:15 +00:00
|
|
|
if (cmd.getArg(0) == "changetype") {
|
|
|
|
InsetCommand::doDispatch(cur, cmd);
|
|
|
|
p = params();
|
|
|
|
} else
|
|
|
|
InsetCommand::string2params("include", to_utf8(cmd.argument()), p);
|
2006-04-15 11:46:17 +00:00
|
|
|
if (!p.getCmdName().empty()) {
|
2007-05-18 14:40:39 +00:00
|
|
|
if (isListings(p)){
|
2008-03-07 13:33:33 +00:00
|
|
|
InsetListingsParams new_params(to_utf8(p["lstparams"]));
|
2008-09-30 08:41:37 +00:00
|
|
|
docstring const new_label =
|
|
|
|
from_utf8(new_params.getParamValue("label"));
|
|
|
|
docstring old_label;
|
|
|
|
if (label_)
|
|
|
|
old_label = label_->getParam("name");
|
|
|
|
if (new_label.empty())
|
2008-03-07 13:33:33 +00:00
|
|
|
delete label_;
|
2008-09-30 08:41:37 +00:00
|
|
|
else if (label_ && old_label != new_label) {
|
|
|
|
label_->updateCommand(new_label);
|
|
|
|
// the label might have been adapted (duplicate)
|
|
|
|
if (new_label != label_->getParam("name")) {
|
|
|
|
new_params.addParam("label",
|
|
|
|
"{" + to_utf8(label_->getParam("name")) + "}");
|
|
|
|
p["lstparams"] = from_utf8(new_params.params());
|
|
|
|
}
|
|
|
|
} else if (old_label != new_label) {
|
|
|
|
label_ = createLabel(new_label);
|
2008-03-07 13:33:33 +00:00
|
|
|
label_->setBuffer(buffer());
|
|
|
|
label_->initView();
|
|
|
|
}
|
2007-05-18 14:40:39 +00:00
|
|
|
}
|
2008-02-27 20:43:16 +00:00
|
|
|
setParams(p);
|
2006-04-15 11:46:17 +00:00
|
|
|
} else
|
2005-05-09 17:29:22 +00:00
|
|
|
cur.noUpdate();
|
2004-02-16 11:58:51 +00:00
|
|
|
break;
|
2003-03-07 15:58:02 +00:00
|
|
|
}
|
2003-03-05 14:59:37 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
//pass everything else up the chain
|
2003-03-07 15:58:02 +00:00
|
|
|
default:
|
2007-10-23 15:02:15 +00:00
|
|
|
InsetCommand::doDispatch(cur, cmd);
|
2004-02-16 11:58:51 +00:00
|
|
|
break;
|
2003-03-07 15:58:02 +00:00
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
}
|
|
|
|
|
1999-12-07 00:44:53 +00:00
|
|
|
|
2008-04-27 18:03:21 +00:00
|
|
|
void InsetInclude::editIncluded(string const & file)
|
|
|
|
{
|
|
|
|
string const ext = support::getExtension(file);
|
|
|
|
if (ext == "lyx") {
|
|
|
|
FuncRequest fr(LFUN_BUFFER_CHILD_OPEN, file);
|
|
|
|
lyx::dispatch(fr);
|
|
|
|
} else
|
|
|
|
// tex file or other text file in verbatim mode
|
|
|
|
formats.edit(buffer(),
|
|
|
|
support::makeAbsPath(file, support::onlyPath(buffer().absFileName())),
|
|
|
|
"text");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool InsetInclude::getStatus(Cursor & cur, FuncRequest const & cmd,
|
|
|
|
FuncStatus & flag) const
|
|
|
|
{
|
|
|
|
switch (cmd.action) {
|
|
|
|
|
|
|
|
case LFUN_INSET_EDIT:
|
2008-05-23 12:16:44 +00:00
|
|
|
case LFUN_INSET_MODIFY:
|
2008-05-29 15:14:00 +00:00
|
|
|
flag.setEnabled(true);
|
2008-04-27 18:03:21 +00:00
|
|
|
return true;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return InsetCommand::getStatus(cur, cmd, flag);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
void InsetInclude::setParams(InsetCommandParams const & p)
|
2001-03-23 17:09:34 +00:00
|
|
|
{
|
2008-02-27 20:43:16 +00:00
|
|
|
InsetCommand::setParams(p);
|
2003-09-19 10:16:33 +00:00
|
|
|
set_label_ = false;
|
2001-03-23 17:09:34 +00:00
|
|
|
|
2002-08-06 14:02:59 +00:00
|
|
|
if (preview_->monitoring())
|
|
|
|
preview_->stopMonitoring();
|
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
if (type(params()) == INPUT)
|
2008-02-27 20:43:16 +00:00
|
|
|
add_preview(*preview_, *this, buffer());
|
2008-03-29 14:41:29 +00:00
|
|
|
|
|
|
|
buffer().updateBibfilesCache();
|
2001-03-14 10:57:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
docstring InsetInclude::screenLabel() const
|
1999-09-27 18:44:28 +00:00
|
|
|
{
|
2006-09-09 15:27:44 +00:00
|
|
|
docstring temp;
|
2001-03-14 10:57:39 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
switch (type(params())) {
|
2006-09-09 15:27:44 +00:00
|
|
|
case INPUT:
|
2008-02-27 20:43:16 +00:00
|
|
|
temp = buffer().B_("Input");
|
2006-09-09 15:27:44 +00:00
|
|
|
break;
|
|
|
|
case VERB:
|
2008-02-27 20:43:16 +00:00
|
|
|
temp = buffer().B_("Verbatim Input");
|
2006-09-09 15:27:44 +00:00
|
|
|
break;
|
|
|
|
case VERBAST:
|
2008-02-27 20:43:16 +00:00
|
|
|
temp = buffer().B_("Verbatim Input*");
|
2006-09-09 15:27:44 +00:00
|
|
|
break;
|
|
|
|
case INCLUDE:
|
2008-02-27 20:43:16 +00:00
|
|
|
temp = buffer().B_("Include");
|
2006-09-09 15:27:44 +00:00
|
|
|
break;
|
2007-10-25 04:13:56 +00:00
|
|
|
case LISTINGS:
|
2007-08-12 21:43:58 +00:00
|
|
|
temp = listings_label_;
|
2007-11-13 01:06:49 +00:00
|
|
|
break;
|
2007-10-25 04:13:56 +00:00
|
|
|
case NONE:
|
2008-04-10 21:49:34 +00:00
|
|
|
LASSERT(false, /**/);
|
2001-03-14 10:57:39 +00:00
|
|
|
}
|
|
|
|
|
2006-10-11 19:40:50 +00:00
|
|
|
temp += ": ";
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
if (params()["filename"].empty())
|
2006-10-11 19:40:50 +00:00
|
|
|
temp += "???";
|
2001-03-14 10:57:39 +00:00
|
|
|
else
|
2007-10-23 15:02:15 +00:00
|
|
|
temp += from_utf8(onlyFilename(to_utf8(params()["filename"])));
|
2001-03-14 10:57:39 +00:00
|
|
|
|
2006-10-11 19:40:50 +00:00
|
|
|
return temp;
|
1999-09-27 18:44:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
/// return the child buffer if the file is a LyX doc and is loaded
|
2006-05-19 07:21:43 +00:00
|
|
|
Buffer * getChildBuffer(Buffer const & buffer, InsetCommandParams const & params)
|
|
|
|
{
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
if (isVerbatim(params) || isListings(params))
|
2006-05-19 07:21:43 +00:00
|
|
|
return 0;
|
|
|
|
|
2006-12-27 10:56:11 +00:00
|
|
|
string const included_file = includedFilename(buffer, params).absFilename();
|
2006-05-19 07:21:43 +00:00
|
|
|
if (!isLyXFilename(included_file))
|
|
|
|
return 0;
|
|
|
|
|
2008-03-06 18:13:04 +00:00
|
|
|
Buffer * childBuffer = loadIfNeeded(buffer, params);
|
2007-05-28 22:27:45 +00:00
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
// FIXME: recursive includes
|
|
|
|
return (childBuffer == &buffer) ? 0 : childBuffer;
|
2006-05-19 07:21:43 +00:00
|
|
|
}
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
|
2007-08-21 07:33:46 +00:00
|
|
|
/// return true if the file is or got loaded.
|
|
|
|
Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params)
|
1999-09-27 18:44:28 +00:00
|
|
|
{
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
if (isVerbatim(params) || isListings(params))
|
2007-08-13 19:40:54 +00:00
|
|
|
return 0;
|
2001-03-14 10:57:39 +00:00
|
|
|
|
2007-10-20 10:03:45 +00:00
|
|
|
string const parent_filename = parent.absFileName();
|
2007-08-21 07:33:46 +00:00
|
|
|
FileName const included_file = makeAbsPath(to_utf8(params["filename"]),
|
|
|
|
onlyPath(parent_filename));
|
|
|
|
|
2006-12-27 10:56:11 +00:00
|
|
|
if (!isLyXFilename(included_file.absFilename()))
|
2007-08-13 19:40:54 +00:00
|
|
|
return 0;
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2008-07-29 08:16:09 +00:00
|
|
|
Buffer * child = theBufferList().getBuffer(included_file);
|
2007-08-21 07:33:46 +00:00
|
|
|
if (!child) {
|
2004-03-25 10:12:44 +00:00
|
|
|
// the readonly flag can/will be wrong, not anymore I think.
|
2007-10-18 19:29:32 +00:00
|
|
|
if (!included_file.exists())
|
2007-08-21 07:33:46 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
child = theBufferList().newBuffer(included_file.absFilename());
|
2007-12-17 18:37:13 +00:00
|
|
|
if (!child)
|
|
|
|
// Buffer creation is not possible.
|
|
|
|
return 0;
|
|
|
|
|
2007-10-21 10:50:56 +00:00
|
|
|
if (!child->loadLyXFile(included_file)) {
|
2007-08-21 07:33:46 +00:00
|
|
|
//close the buffer we just opened
|
2007-12-04 22:21:25 +00:00
|
|
|
theBufferList().release(child);
|
2007-08-21 07:33:46 +00:00
|
|
|
return 0;
|
2007-07-10 15:07:00 +00:00
|
|
|
}
|
2008-03-06 18:13:04 +00:00
|
|
|
|
|
|
|
if (!child->errorList("Parse").empty()) {
|
|
|
|
// FIXME: Do something.
|
|
|
|
}
|
2004-03-25 10:12:44 +00:00
|
|
|
}
|
2007-11-30 17:41:27 +00:00
|
|
|
child->setParent(&parent);
|
2007-08-21 07:33:46 +00:00
|
|
|
return child;
|
1999-09-27 18:44:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
|
1999-09-27 18:44:28 +00:00
|
|
|
{
|
2008-02-27 20:43:16 +00:00
|
|
|
string incfile = to_utf8(params()["filename"]);
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2000-03-02 02:19:43 +00:00
|
|
|
// Do nothing if no file name has been specified
|
2000-09-26 13:54:57 +00:00
|
|
|
if (incfile.empty())
|
2000-03-02 02:19:43 +00:00
|
|
|
return 0;
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2008-04-20 03:08:11 +00:00
|
|
|
FileName const included_file = includedFilename(buffer(), params());
|
2007-05-28 22:27:45 +00:00
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
// Check we're not trying to include ourselves.
|
|
|
|
// FIXME RECURSIVE INCLUDE
|
|
|
|
// This isn't sufficient, as the inclusion could be downstream.
|
|
|
|
// But it'll have to do for now.
|
2007-10-23 15:02:15 +00:00
|
|
|
if (isInputOrInclude(params()) &&
|
2008-02-27 20:43:16 +00:00
|
|
|
buffer().absFileName() == included_file.absFilename())
|
2007-05-24 17:17:04 +00:00
|
|
|
{
|
2007-05-28 22:27:45 +00:00
|
|
|
Alert::error(_("Recursive input"),
|
|
|
|
bformat(_("Attempted to include file %1$s in itself! "
|
|
|
|
"Ignoring inclusion."), from_utf8(incfile)));
|
2007-05-21 15:34:29 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
Buffer const * const masterBuffer = buffer().masterBuffer();
|
2004-03-25 10:12:44 +00:00
|
|
|
|
|
|
|
// if incfile is relative, make it relative to the master
|
|
|
|
// buffer directory.
|
2007-12-17 16:04:46 +00:00
|
|
|
if (!FileName(incfile).isAbsolute()) {
|
2007-03-27 07:24:16 +00:00
|
|
|
// FIXME UNICODE
|
|
|
|
incfile = to_utf8(makeRelPath(from_utf8(included_file.absFilename()),
|
2007-10-20 10:03:45 +00:00
|
|
|
from_utf8(masterBuffer->filePath())));
|
2004-03-25 10:12:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// write it to a file (so far the complete file)
|
2006-04-08 22:31:11 +00:00
|
|
|
string const exportfile = changeExtension(incfile, ".tex");
|
2007-05-28 22:27:45 +00:00
|
|
|
string const mangled =
|
2007-05-24 17:17:04 +00:00
|
|
|
DocFileName(changeExtension(included_file.absFilename(),".tex")).
|
|
|
|
mangledFilename();
|
2007-10-20 10:03:45 +00:00
|
|
|
FileName const writefile(makeAbsPath(mangled, masterBuffer->temppath()));
|
2004-03-25 10:12:44 +00:00
|
|
|
|
2004-06-01 13:39:33 +00:00
|
|
|
if (!runparams.nice)
|
|
|
|
incfile = mangled;
|
2007-06-26 16:55:42 +00:00
|
|
|
else if (!isValidLaTeXFilename(incfile)) {
|
|
|
|
frontend::Alert::warning(_("Invalid filename"),
|
2007-09-16 10:36:57 +00:00
|
|
|
_("The following filename is likely to cause trouble "
|
2007-06-26 16:55:42 +00:00
|
|
|
"when running the exported file through LaTeX: ") +
|
|
|
|
from_utf8(incfile));
|
|
|
|
}
|
2007-11-15 20:04:51 +00:00
|
|
|
LYXERR(Debug::LATEX, "incfile:" << incfile);
|
|
|
|
LYXERR(Debug::LATEX, "exportfile:" << exportfile);
|
|
|
|
LYXERR(Debug::LATEX, "writefile:" << writefile);
|
2003-09-19 10:16:33 +00:00
|
|
|
|
2007-05-26 17:26:58 +00:00
|
|
|
if (runparams.inComment || runparams.dryrun) {
|
|
|
|
//Don't try to load or copy the file if we're
|
|
|
|
//in a comment or doing a dryrun
|
2007-10-23 15:02:15 +00:00
|
|
|
} else if (isInputOrInclude(params()) &&
|
2007-05-28 22:27:45 +00:00
|
|
|
isLyXFilename(included_file.absFilename())) {
|
2007-05-26 17:26:58 +00:00
|
|
|
//if it's a LyX file and we're inputting or including,
|
2007-05-24 17:17:04 +00:00
|
|
|
//try to load it so we can write the associated latex
|
2008-02-27 20:43:16 +00:00
|
|
|
if (!loadIfNeeded(buffer(), params()))
|
2007-05-24 17:17:04 +00:00
|
|
|
return false;
|
2007-05-28 22:27:45 +00:00
|
|
|
|
2008-07-29 08:16:09 +00:00
|
|
|
Buffer * tmp = theBufferList().getBuffer(included_file);
|
2000-03-02 02:19:43 +00:00
|
|
|
|
2008-02-24 15:12:41 +00:00
|
|
|
if (tmp->params().baseClass() != masterBuffer->params().baseClass()) {
|
2006-09-09 15:27:44 +00:00
|
|
|
// FIXME UNICODE
|
2006-09-11 08:54:10 +00:00
|
|
|
docstring text = bformat(_("Included file `%1$s'\n"
|
2008-03-11 08:37:30 +00:00
|
|
|
"has textclass `%2$s'\n"
|
|
|
|
"while parent file has textclass `%3$s'."),
|
|
|
|
included_file.displayName(),
|
|
|
|
from_utf8(tmp->params().documentClass().name()),
|
|
|
|
from_utf8(masterBuffer->params().documentClass().name()));
|
2006-09-11 08:54:10 +00:00
|
|
|
Alert::warning(_("Different textclasses"), text);
|
2000-03-02 02:19:43 +00:00
|
|
|
}
|
2007-09-16 10:36:57 +00:00
|
|
|
|
This is one of a series of patches that will merge the layout modules development in personal/branches/rgheck back into the tree.
Design goal: Allow the use of layout "modules", which are to LaTeX packages as layout files are to LaTeX document classes. Thus, one could have a module that defined certain character styles, environments, commands, or what have you, and include it in various documents, each of which uses a different document class, without having to modify the layout files themselves. For example, a theorems.module could be used with article.layout to provide support for theorem-type environments, without having to modify article.layout itself, and the same module could be used with book.layout, etc.
This patch adds the backend. The ModuleList class holds a list of the available modules, which are retrieved from lyxmodules.lst, itself generated by configure.py. There are two LFUNs available: modules-clear and module-add, which do the obvious thing; you can test by typing these into the minibuffer, along with the name of one of the available modules: URL (a CharStyle), Endnote (a Custom Inset), and---with the spaces---End To Foot (View>LaTeX and look at the user preamble), which are themselves in lib/layouts. There are some others, too, that allow theorems to be added to classes like article and book.
The GUI will come next.
Issues: (i) The configure.py script could be improved. It'd be nice, for example, if it tested for the presence of the LaTeX packages a particular module needs. But this would mean re-working the LaTeX script, and I don't know how to do that. Note that at present, the packages are ignored. This will change shortly. (ii) I've used std::string in LyXModule, following what seemed to be a precedent in TextClass. If some of these should be docstrings, please let me know, and I'll change them. (iii) There is at present no distinction between LaTeX and DocBook modules. Should there be? That is: Should there be modules that are available when the document class is a LaTeX class and others that are available only when it is DocBook? Or should there just be one set of modules? Each module can of course indicate for what it is suitable in its description.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19893 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 17:59:49 +00:00
|
|
|
// Make sure modules used in child are all included in master
|
|
|
|
//FIXME It might be worth loading the children's modules into the master
|
|
|
|
//over in BufferParams rather than doing this check.
|
2008-10-14 14:04:21 +00:00
|
|
|
list<string> const masterModules = masterBuffer->params().getModules();
|
|
|
|
list<string> const childModules = tmp->params().getModules();
|
|
|
|
list<string>::const_iterator it = childModules.begin();
|
|
|
|
list<string>::const_iterator end = childModules.end();
|
This is one of a series of patches that will merge the layout modules development in personal/branches/rgheck back into the tree.
Design goal: Allow the use of layout "modules", which are to LaTeX packages as layout files are to LaTeX document classes. Thus, one could have a module that defined certain character styles, environments, commands, or what have you, and include it in various documents, each of which uses a different document class, without having to modify the layout files themselves. For example, a theorems.module could be used with article.layout to provide support for theorem-type environments, without having to modify article.layout itself, and the same module could be used with book.layout, etc.
This patch adds the backend. The ModuleList class holds a list of the available modules, which are retrieved from lyxmodules.lst, itself generated by configure.py. There are two LFUNs available: modules-clear and module-add, which do the obvious thing; you can test by typing these into the minibuffer, along with the name of one of the available modules: URL (a CharStyle), Endnote (a Custom Inset), and---with the spaces---End To Foot (View>LaTeX and look at the user preamble), which are themselves in lib/layouts. There are some others, too, that allow theorems to be added to classes like article and book.
The GUI will come next.
Issues: (i) The configure.py script could be improved. It'd be nice, for example, if it tested for the presence of the LaTeX packages a particular module needs. But this would mean re-working the LaTeX script, and I don't know how to do that. Note that at present, the packages are ignored. This will change shortly. (ii) I've used std::string in LyXModule, following what seemed to be a precedent in TextClass. If some of these should be docstrings, please let me know, and I'll change them. (iii) There is at present no distinction between LaTeX and DocBook modules. Should there be? That is: Should there be modules that are available when the document class is a LaTeX class and others that are available only when it is DocBook? Or should there just be one set of modules? Each module can of course indicate for what it is suitable in its description.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19893 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 17:59:49 +00:00
|
|
|
for (; it != end; ++it) {
|
|
|
|
string const module = *it;
|
2008-10-14 14:04:21 +00:00
|
|
|
list<string>::const_iterator found =
|
This is one of a series of patches that will merge the layout modules development in personal/branches/rgheck back into the tree.
Design goal: Allow the use of layout "modules", which are to LaTeX packages as layout files are to LaTeX document classes. Thus, one could have a module that defined certain character styles, environments, commands, or what have you, and include it in various documents, each of which uses a different document class, without having to modify the layout files themselves. For example, a theorems.module could be used with article.layout to provide support for theorem-type environments, without having to modify article.layout itself, and the same module could be used with book.layout, etc.
This patch adds the backend. The ModuleList class holds a list of the available modules, which are retrieved from lyxmodules.lst, itself generated by configure.py. There are two LFUNs available: modules-clear and module-add, which do the obvious thing; you can test by typing these into the minibuffer, along with the name of one of the available modules: URL (a CharStyle), Endnote (a Custom Inset), and---with the spaces---End To Foot (View>LaTeX and look at the user preamble), which are themselves in lib/layouts. There are some others, too, that allow theorems to be added to classes like article and book.
The GUI will come next.
Issues: (i) The configure.py script could be improved. It'd be nice, for example, if it tested for the presence of the LaTeX packages a particular module needs. But this would mean re-working the LaTeX script, and I don't know how to do that. Note that at present, the packages are ignored. This will change shortly. (ii) I've used std::string in LyXModule, following what seemed to be a precedent in TextClass. If some of these should be docstrings, please let me know, and I'll change them. (iii) There is at present no distinction between LaTeX and DocBook modules. Should there be? That is: Should there be modules that are available when the document class is a LaTeX class and others that are available only when it is DocBook? Or should there just be one set of modules? Each module can of course indicate for what it is suitable in its description.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19893 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 17:59:49 +00:00
|
|
|
find(masterModules.begin(), masterModules.end(), module);
|
2008-03-16 15:49:41 +00:00
|
|
|
if (found == masterModules.end()) {
|
This is one of a series of patches that will merge the layout modules development in personal/branches/rgheck back into the tree.
Design goal: Allow the use of layout "modules", which are to LaTeX packages as layout files are to LaTeX document classes. Thus, one could have a module that defined certain character styles, environments, commands, or what have you, and include it in various documents, each of which uses a different document class, without having to modify the layout files themselves. For example, a theorems.module could be used with article.layout to provide support for theorem-type environments, without having to modify article.layout itself, and the same module could be used with book.layout, etc.
This patch adds the backend. The ModuleList class holds a list of the available modules, which are retrieved from lyxmodules.lst, itself generated by configure.py. There are two LFUNs available: modules-clear and module-add, which do the obvious thing; you can test by typing these into the minibuffer, along with the name of one of the available modules: URL (a CharStyle), Endnote (a Custom Inset), and---with the spaces---End To Foot (View>LaTeX and look at the user preamble), which are themselves in lib/layouts. There are some others, too, that allow theorems to be added to classes like article and book.
The GUI will come next.
Issues: (i) The configure.py script could be improved. It'd be nice, for example, if it tested for the presence of the LaTeX packages a particular module needs. But this would mean re-working the LaTeX script, and I don't know how to do that. Note that at present, the packages are ignored. This will change shortly. (ii) I've used std::string in LyXModule, following what seemed to be a precedent in TextClass. If some of these should be docstrings, please let me know, and I'll change them. (iii) There is at present no distinction between LaTeX and DocBook modules. Should there be? That is: Should there be modules that are available when the document class is a LaTeX class and others that are available only when it is DocBook? Or should there just be one set of modules? Each module can of course indicate for what it is suitable in its description.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19893 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 17:59:49 +00:00
|
|
|
docstring text = bformat(_("Included file `%1$s'\n"
|
2008-03-11 08:37:30 +00:00
|
|
|
"uses module `%2$s'\n"
|
|
|
|
"which is not used in parent file."),
|
|
|
|
included_file.displayName(), from_utf8(module));
|
This is one of a series of patches that will merge the layout modules development in personal/branches/rgheck back into the tree.
Design goal: Allow the use of layout "modules", which are to LaTeX packages as layout files are to LaTeX document classes. Thus, one could have a module that defined certain character styles, environments, commands, or what have you, and include it in various documents, each of which uses a different document class, without having to modify the layout files themselves. For example, a theorems.module could be used with article.layout to provide support for theorem-type environments, without having to modify article.layout itself, and the same module could be used with book.layout, etc.
This patch adds the backend. The ModuleList class holds a list of the available modules, which are retrieved from lyxmodules.lst, itself generated by configure.py. There are two LFUNs available: modules-clear and module-add, which do the obvious thing; you can test by typing these into the minibuffer, along with the name of one of the available modules: URL (a CharStyle), Endnote (a Custom Inset), and---with the spaces---End To Foot (View>LaTeX and look at the user preamble), which are themselves in lib/layouts. There are some others, too, that allow theorems to be added to classes like article and book.
The GUI will come next.
Issues: (i) The configure.py script could be improved. It'd be nice, for example, if it tested for the presence of the LaTeX packages a particular module needs. But this would mean re-working the LaTeX script, and I don't know how to do that. Note that at present, the packages are ignored. This will change shortly. (ii) I've used std::string in LyXModule, following what seemed to be a precedent in TextClass. If some of these should be docstrings, please let me know, and I'll change them. (iii) There is at present no distinction between LaTeX and DocBook modules. Should there be? That is: Should there be modules that are available when the document class is a LaTeX class and others that are available only when it is DocBook? Or should there just be one set of modules? Each module can of course indicate for what it is suitable in its description.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19893 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 17:59:49 +00:00
|
|
|
Alert::warning(_("Module not found"), text);
|
|
|
|
}
|
|
|
|
}
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2007-10-20 10:03:45 +00:00
|
|
|
tmp->markDepClean(masterBuffer->temppath());
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2007-08-10 11:47:12 +00:00
|
|
|
// FIXME: handle non existing files
|
|
|
|
// FIXME: Second argument is irrelevant!
|
2004-03-25 10:12:44 +00:00
|
|
|
// since only_body is true, makeLaTeXFile will not look at second
|
|
|
|
// argument. Should we set it to string(), or should makeLaTeXFile
|
|
|
|
// make use of it somehow? (JMarc 20031002)
|
2007-03-25 16:31:16 +00:00
|
|
|
// The included file might be written in a different encoding
|
|
|
|
Encoding const * const oldEnc = runparams.encoding;
|
|
|
|
runparams.encoding = &tmp->params().encoding();
|
2006-12-04 15:46:57 +00:00
|
|
|
tmp->makeLaTeXFile(writefile,
|
2008-02-27 20:43:16 +00:00
|
|
|
masterFileName(buffer()).onlyPath().absFilename(),
|
2003-07-26 21:37:10 +00:00
|
|
|
runparams, false);
|
2007-03-25 16:31:16 +00:00
|
|
|
runparams.encoding = oldEnc;
|
2004-06-01 13:39:33 +00:00
|
|
|
} else {
|
2007-05-26 17:26:58 +00:00
|
|
|
// In this case, it's not a LyX file, so we copy the file
|
2007-05-28 22:27:45 +00:00
|
|
|
// to the temp dir, so that .aux files etc. are not created
|
|
|
|
// in the original dir. Files included by this file will be
|
2007-05-26 17:26:58 +00:00
|
|
|
// found via input@path, see ../Buffer.cpp.
|
2007-11-30 09:23:44 +00:00
|
|
|
unsigned long const checksum_in = included_file.checksum();
|
|
|
|
unsigned long const checksum_out = writefile.checksum();
|
2004-03-25 10:12:44 +00:00
|
|
|
|
|
|
|
if (checksum_in != checksum_out) {
|
2007-12-15 08:25:53 +00:00
|
|
|
if (!included_file.copyTo(writefile)) {
|
2006-09-09 15:27:44 +00:00
|
|
|
// FIXME UNICODE
|
2007-11-15 20:04:51 +00:00
|
|
|
LYXERR(Debug::LATEX,
|
|
|
|
to_utf8(bformat(_("Could not copy the file\n%1$s\n"
|
2006-09-11 08:54:10 +00:00
|
|
|
"into the temporary directory."),
|
2007-11-15 20:04:51 +00:00
|
|
|
from_utf8(included_file.absFilename()))));
|
2004-03-25 10:12:44 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2001-03-14 10:57:39 +00:00
|
|
|
}
|
2000-03-02 02:19:43 +00:00
|
|
|
|
2006-03-28 18:49:46 +00:00
|
|
|
string const tex_format = (runparams.flavor == OutputParams::LATEX) ?
|
|
|
|
"latex" : "pdflatex";
|
2007-10-23 15:02:15 +00:00
|
|
|
if (isVerbatim(params())) {
|
2005-04-18 17:43:11 +00:00
|
|
|
incfile = latex_path(incfile);
|
2006-10-19 16:51:30 +00:00
|
|
|
// FIXME UNICODE
|
2007-10-23 15:02:15 +00:00
|
|
|
os << '\\' << from_ascii(params().getCmdName()) << '{'
|
2006-10-21 00:16:43 +00:00
|
|
|
<< from_utf8(incfile) << '}';
|
2007-10-23 15:02:15 +00:00
|
|
|
} else if (type(params()) == INPUT) {
|
2006-03-28 18:49:46 +00:00
|
|
|
runparams.exportdata->addExternalFile(tex_format, writefile,
|
2006-04-05 23:56:29 +00:00
|
|
|
exportfile);
|
2004-06-01 13:39:33 +00:00
|
|
|
|
2000-03-02 02:19:43 +00:00
|
|
|
// \input wants file with extension (default is .tex)
|
2006-11-26 21:30:39 +00:00
|
|
|
if (!isLyXFilename(included_file.absFilename())) {
|
2005-04-18 17:43:11 +00:00
|
|
|
incfile = latex_path(incfile);
|
2006-10-19 16:51:30 +00:00
|
|
|
// FIXME UNICODE
|
2007-10-23 15:02:15 +00:00
|
|
|
os << '\\' << from_ascii(params().getCmdName())
|
2006-10-21 00:16:43 +00:00
|
|
|
<< '{' << from_utf8(incfile) << '}';
|
2000-03-02 02:19:43 +00:00
|
|
|
} else {
|
2006-04-08 22:31:11 +00:00
|
|
|
incfile = changeExtension(incfile, ".tex");
|
2005-04-18 17:43:11 +00:00
|
|
|
incfile = latex_path(incfile);
|
2006-10-19 16:51:30 +00:00
|
|
|
// FIXME UNICODE
|
2007-10-23 15:02:15 +00:00
|
|
|
os << '\\' << from_ascii(params().getCmdName())
|
2006-10-21 00:16:43 +00:00
|
|
|
<< '{' << from_utf8(incfile) << '}';
|
2000-03-02 02:19:43 +00:00
|
|
|
}
|
2007-10-23 15:02:15 +00:00
|
|
|
} else if (type(params()) == LISTINGS) {
|
|
|
|
os << '\\' << from_ascii(params().getCmdName());
|
2007-10-23 18:51:04 +00:00
|
|
|
string const opt = to_utf8(params()["lstparams"]);
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
// opt is set in QInclude dialog and should have passed validation.
|
|
|
|
InsetListingsParams params(opt);
|
|
|
|
if (!params.params().empty())
|
2007-05-24 22:19:58 +00:00
|
|
|
os << "[" << from_utf8(params.params()) << "]";
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
os << '{' << from_utf8(incfile) << '}';
|
2000-03-02 02:19:43 +00:00
|
|
|
} else {
|
2006-03-28 18:49:46 +00:00
|
|
|
runparams.exportdata->addExternalFile(tex_format, writefile,
|
2006-04-05 23:56:29 +00:00
|
|
|
exportfile);
|
2004-06-01 13:39:33 +00:00
|
|
|
|
2000-03-02 02:19:43 +00:00
|
|
|
// \include don't want extension and demands that the
|
|
|
|
// file really have .tex
|
2006-04-08 22:31:11 +00:00
|
|
|
incfile = changeExtension(incfile, string());
|
2005-04-18 17:43:11 +00:00
|
|
|
incfile = latex_path(incfile);
|
2006-10-19 16:51:30 +00:00
|
|
|
// FIXME UNICODE
|
2007-10-23 15:02:15 +00:00
|
|
|
os << '\\' << from_ascii(params().getCmdName()) << '{'
|
2006-10-21 00:16:43 +00:00
|
|
|
<< from_utf8(incfile) << '}';
|
2000-03-02 02:19:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
1999-09-27 18:44:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
int InsetInclude::plaintext(odocstream & os, OutputParams const &) const
|
2000-12-28 16:22:28 +00:00
|
|
|
{
|
2007-10-23 15:02:15 +00:00
|
|
|
if (isVerbatim(params()) || isListings(params())) {
|
2008-02-27 20:43:16 +00:00
|
|
|
os << '[' << screenLabel() << '\n';
|
2007-12-02 11:55:25 +00:00
|
|
|
// FIXME: We don't know the encoding of the file, default to UTF-8.
|
2008-02-27 20:43:16 +00:00
|
|
|
os << includedFilename(buffer(), params()).fileContents("UTF-8");
|
2007-02-20 19:14:55 +00:00
|
|
|
os << "\n]";
|
|
|
|
return PLAINTEXT_NEWLINE + 1; // one char on a separate line
|
|
|
|
} else {
|
2008-02-27 20:43:16 +00:00
|
|
|
docstring const str = '[' + screenLabel() + ']';
|
2007-02-20 19:14:55 +00:00
|
|
|
os << str;
|
|
|
|
return str.size();
|
2006-09-10 09:28:00 +00:00
|
|
|
}
|
2000-12-28 16:22:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
int InsetInclude::docbook(odocstream & os, OutputParams const & runparams) const
|
2000-07-01 12:54:45 +00:00
|
|
|
{
|
2007-10-23 15:02:15 +00:00
|
|
|
string incfile = to_utf8(params()["filename"]);
|
2000-09-26 13:54:57 +00:00
|
|
|
|
2000-07-01 12:54:45 +00:00
|
|
|
// Do nothing if no file name has been specified
|
2000-09-26 13:54:57 +00:00
|
|
|
if (incfile.empty())
|
2000-07-01 12:54:45 +00:00
|
|
|
return 0;
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
string const included_file = includedFilename(buffer(), params()).absFilename();
|
2003-09-19 10:16:33 +00:00
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
// Check we're not trying to include ourselves.
|
|
|
|
// FIXME RECURSIVE INCLUDE
|
|
|
|
// This isn't sufficient, as the inclusion could be downstream.
|
|
|
|
// But it'll have to do for now.
|
|
|
|
if (buffer().absFileName() == included_file) {
|
2007-05-28 22:27:45 +00:00
|
|
|
Alert::error(_("Recursive input"),
|
|
|
|
bformat(_("Attempted to include file %1$s in itself! "
|
|
|
|
"Ignoring inclusion."), from_utf8(incfile)));
|
2007-05-21 15:34:29 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-06-01 13:39:33 +00:00
|
|
|
// write it to a file (so far the complete file)
|
2006-04-08 22:31:11 +00:00
|
|
|
string const exportfile = changeExtension(incfile, ".sgml");
|
2006-11-26 21:30:39 +00:00
|
|
|
DocFileName writefile(changeExtension(included_file, ".sgml"));
|
2004-06-01 13:39:33 +00:00
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
if (loadIfNeeded(buffer(), params())) {
|
2008-07-29 08:16:09 +00:00
|
|
|
Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
|
2000-07-01 12:54:45 +00:00
|
|
|
|
2006-11-26 21:30:39 +00:00
|
|
|
string const mangled = writefile.mangledFilename();
|
2006-04-08 22:31:11 +00:00
|
|
|
writefile = makeAbsPath(mangled,
|
2008-02-27 20:43:16 +00:00
|
|
|
buffer().masterBuffer()->temppath());
|
2004-06-01 13:39:33 +00:00
|
|
|
if (!runparams.nice)
|
|
|
|
incfile = mangled;
|
2000-07-01 12:54:45 +00:00
|
|
|
|
2007-11-15 20:04:51 +00:00
|
|
|
LYXERR(Debug::LATEX, "incfile:" << incfile);
|
|
|
|
LYXERR(Debug::LATEX, "exportfile:" << exportfile);
|
|
|
|
LYXERR(Debug::LATEX, "writefile:" << writefile);
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2006-12-04 15:46:57 +00:00
|
|
|
tmp->makeDocBookFile(writefile, runparams, true);
|
2001-03-14 10:57:39 +00:00
|
|
|
}
|
2000-07-01 12:54:45 +00:00
|
|
|
|
2004-06-01 13:39:33 +00:00
|
|
|
runparams.exportdata->addExternalFile("docbook", writefile,
|
2006-04-05 23:56:29 +00:00
|
|
|
exportfile);
|
2004-06-01 13:39:33 +00:00
|
|
|
runparams.exportdata->addExternalFile("docbook-xml", writefile,
|
2006-04-05 23:56:29 +00:00
|
|
|
exportfile);
|
2004-06-01 13:39:33 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
if (isVerbatim(params()) || isListings(params())) {
|
2002-01-16 12:04:16 +00:00
|
|
|
os << "<inlinegraphic fileref=\""
|
2006-10-21 19:40:29 +00:00
|
|
|
<< '&' << include_label << ';'
|
2002-01-16 12:54:52 +00:00
|
|
|
<< "\" format=\"linespecific\">";
|
2001-03-14 10:57:39 +00:00
|
|
|
} else
|
2007-05-28 22:27:45 +00:00
|
|
|
os << '&' << include_label << ';';
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2000-07-01 12:54:45 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-28 10:25:20 +00:00
|
|
|
void InsetInclude::validate(LaTeXFeatures & features) const
|
1999-09-27 18:44:28 +00:00
|
|
|
{
|
2007-10-23 18:51:04 +00:00
|
|
|
string incfile = to_utf8(params()["filename"]);
|
2001-03-14 10:57:39 +00:00
|
|
|
string writefile;
|
|
|
|
|
2008-04-10 21:49:34 +00:00
|
|
|
LASSERT(&buffer() == &features.buffer(), /**/);
|
2003-09-19 10:16:33 +00:00
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
string const included_file =
|
2008-04-18 03:11:06 +00:00
|
|
|
includedFilename(buffer(), params()).absFilename();
|
2000-11-13 15:43:36 +00:00
|
|
|
|
2006-04-08 09:09:57 +00:00
|
|
|
if (isLyXFilename(included_file))
|
2006-04-08 22:31:11 +00:00
|
|
|
writefile = changeExtension(included_file, ".sgml");
|
2004-02-25 12:00:53 +00:00
|
|
|
else
|
2003-09-19 10:16:33 +00:00
|
|
|
writefile = included_file;
|
2000-07-01 12:54:45 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
if (!features.runparams().nice && !isVerbatim(params()) && !isListings(params())) {
|
2006-11-18 12:49:47 +00:00
|
|
|
incfile = DocFileName(writefile).mangledFilename();
|
2006-04-08 22:31:11 +00:00
|
|
|
writefile = makeAbsPath(incfile,
|
2008-02-27 20:43:16 +00:00
|
|
|
buffer().masterBuffer()->temppath()).absFilename();
|
2004-02-25 12:00:53 +00:00
|
|
|
}
|
|
|
|
|
2001-11-19 15:34:11 +00:00
|
|
|
features.includeFile(include_label, writefile);
|
2000-07-01 12:54:45 +00:00
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
if (isVerbatim(params()))
|
2001-11-19 15:34:11 +00:00
|
|
|
features.require("verbatim");
|
2007-10-23 15:02:15 +00:00
|
|
|
else if (isListings(params()))
|
Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
* src/insets/Inset.h,cpp: LISTINGS_CODE
* src/insets/InsetInclude.cpp: handle \lstinputlisting
* src/insets/InsetListings.h,cpp: new listings inset
* src/insets/InsetListingsParams.h,cpp: parameters from listings package
* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
* src/Bidi.cpp: handle LISTINGS_CODE
* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
* src/frontends/qt4/ui/ListingsUi.ui: new dialog
* src/frontends/qt4/ui/IncludeUi.ui: update UI
* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
* src/frontends/qt4/QListings.h,cpp: new listings inset
* src/frontends/qt4/Dialogs.cpp: new listings dialog
* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
* src/frontends/controllers/ControlListings.h,cpp: new listings inset
* src/LyXFunc.cpp: handle LISTING_CODE
* src/Paragraph.cpp: handle LISTING_CODE
* src/factory.cpp: new listings inset
* src/CutAndPaste.cpp: handle LISTINGS_CODE
* src/LaTeXFeatures.cpp: require listings
* src/Text3.cpp: Handle LISTINGS_CODE
* src/lfuns.h: add LFUN_LISTING_INSERT
* src/Buffer.cpp: change lyx file format to 269
* src/BufferParams.h,cpp: add listings_params to preamble
* lib/lyx2lyx/LyX.py: lyx2lyx
* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
* lib/ui/stdmenus.inc: new menu item (no shortcut!)
* src/insets/Makefile.am: update autotools
* src/frontends/controllers/Makefile.am
* src/frontends/qt4/Makefile.dialogs
* src/frontends/qt4/Makefile.am
* po/POTFILES.in: a few more translatable files.
* development/scons/scons_manifest.py: scons build system
* development/FORMAT: document format changes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
|
|
|
features.require("listings");
|
1999-09-27 18:44:28 +00:00
|
|
|
|
|
|
|
// Here we must do the fun stuff...
|
|
|
|
// Load the file in the include if it needs
|
|
|
|
// to be loaded:
|
2008-02-27 20:43:16 +00:00
|
|
|
if (loadIfNeeded(buffer(), params())) {
|
1999-09-27 18:44:28 +00:00
|
|
|
// a file got loaded
|
2008-07-29 08:16:09 +00:00
|
|
|
Buffer * const tmp = theBufferList().getBuffer(FileName(included_file));
|
2007-05-21 15:34:29 +00:00
|
|
|
// make sure the buffer isn't us
|
|
|
|
// FIXME RECURSIVE INCLUDES
|
|
|
|
// This is not sufficient, as recursive includes could be
|
|
|
|
// more than a file away. But it will do for now.
|
2008-02-27 20:43:16 +00:00
|
|
|
if (tmp && tmp != &buffer()) {
|
2004-04-08 10:09:09 +00:00
|
|
|
// We must temporarily change features.buffer,
|
|
|
|
// otherwise it would always be the master buffer,
|
|
|
|
// and nested includes would not work.
|
|
|
|
features.setBuffer(*tmp);
|
2001-03-23 17:09:34 +00:00
|
|
|
tmp->validate(features);
|
2008-02-27 20:43:16 +00:00
|
|
|
features.setBuffer(buffer());
|
2004-04-08 10:09:09 +00:00
|
|
|
}
|
1999-09-27 18:44:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
void InsetInclude::fillWithBibKeys(BiblioInfo & keys,
|
|
|
|
InsetIterator const & /*di*/) const
|
1999-09-27 18:44:28 +00:00
|
|
|
{
|
2008-02-27 20:43:16 +00:00
|
|
|
if (loadIfNeeded(buffer(), params())) {
|
|
|
|
string const included_file = includedFilename(buffer(), params()).absFilename();
|
2008-07-29 08:16:09 +00:00
|
|
|
Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
|
2008-04-25 20:03:03 +00:00
|
|
|
BiblioInfo const & newkeys = tmp->localBibInfo();
|
|
|
|
keys.mergeBiblioInfo(newkeys);
|
1999-09-27 18:44:28 +00:00
|
|
|
}
|
|
|
|
}
|
2002-08-01 17:28:59 +00:00
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
void InsetInclude::updateBibfilesCache()
|
2006-04-15 11:46:17 +00:00
|
|
|
{
|
2008-02-27 20:43:16 +00:00
|
|
|
Buffer * const tmp = getChildBuffer(buffer(), params());
|
2006-05-19 07:21:43 +00:00
|
|
|
if (tmp) {
|
2007-11-30 17:41:27 +00:00
|
|
|
tmp->setParent(0);
|
2006-04-15 11:46:17 +00:00
|
|
|
tmp->updateBibfilesCache();
|
2008-02-27 20:43:16 +00:00
|
|
|
tmp->setParent(&buffer());
|
2006-04-15 11:46:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-04-19 15:52:35 +00:00
|
|
|
support::FileNameList const &
|
2008-03-29 14:41:29 +00:00
|
|
|
InsetInclude::getBibfilesCache(Buffer const & buffer) const
|
2006-04-15 11:46:17 +00:00
|
|
|
{
|
2007-10-23 15:02:15 +00:00
|
|
|
Buffer * const tmp = getChildBuffer(buffer, params());
|
2006-05-19 07:21:43 +00:00
|
|
|
if (tmp) {
|
2007-11-30 17:41:27 +00:00
|
|
|
tmp->setParent(0);
|
2008-04-19 15:52:35 +00:00
|
|
|
support::FileNameList const & cache = tmp->getBibfilesCache();
|
2007-11-30 17:41:27 +00:00
|
|
|
tmp->setParent(&buffer);
|
2006-04-15 11:46:17 +00:00
|
|
|
return cache;
|
|
|
|
}
|
2008-04-19 15:52:35 +00:00
|
|
|
static support::FileNameList const empty;
|
2006-04-15 11:46:17 +00:00
|
|
|
return empty;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-09-21 20:39:47 +00:00
|
|
|
void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
|
2002-08-01 17:28:59 +00:00
|
|
|
{
|
2008-04-10 21:49:34 +00:00
|
|
|
LASSERT(mi.base.bv, /**/);
|
2004-04-19 13:05:36 +00:00
|
|
|
|
|
|
|
bool use_preview = false;
|
2004-04-19 13:31:17 +00:00
|
|
|
if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {
|
2006-10-21 00:16:43 +00:00
|
|
|
graphics::PreviewImage const * pimage =
|
2007-08-21 13:03:55 +00:00
|
|
|
preview_->getPreviewImage(mi.base.bv->buffer());
|
2004-04-19 13:05:36 +00:00
|
|
|
use_preview = pimage && pimage->image();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (use_preview) {
|
2003-10-10 21:24:06 +00:00
|
|
|
preview_->metrics(mi, dim);
|
2003-06-02 10:03:27 +00:00
|
|
|
} else {
|
2003-06-12 08:52:36 +00:00
|
|
|
if (!set_label_) {
|
|
|
|
set_label_ = true;
|
2008-02-27 20:43:16 +00:00
|
|
|
button_.update(screenLabel(), true);
|
2003-06-12 08:52:36 +00:00
|
|
|
}
|
|
|
|
button_.metrics(mi, dim);
|
2003-06-02 10:03:27 +00:00
|
|
|
}
|
2004-08-14 19:20:42 +00:00
|
|
|
|
|
|
|
Box b(0, dim.wid, -dim.asc, dim.des);
|
2003-09-04 14:02:05 +00:00
|
|
|
button_.setBox(b);
|
2002-08-01 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-30 06:48:24 +00:00
|
|
|
void InsetInclude::draw(PainterInfo & pi, int x, int y) const
|
2002-08-01 17:28:59 +00:00
|
|
|
{
|
2008-04-10 21:49:34 +00:00
|
|
|
LASSERT(pi.base.bv, /**/);
|
2004-04-19 13:05:36 +00:00
|
|
|
|
|
|
|
bool use_preview = false;
|
2004-08-14 19:20:42 +00:00
|
|
|
if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {
|
2006-10-21 00:16:43 +00:00
|
|
|
graphics::PreviewImage const * pimage =
|
2007-08-21 13:03:55 +00:00
|
|
|
preview_->getPreviewImage(pi.base.bv->buffer());
|
2004-04-19 13:05:36 +00:00
|
|
|
use_preview = pimage && pimage->image();
|
2002-08-01 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
2004-04-19 13:05:36 +00:00
|
|
|
if (use_preview)
|
2004-08-14 19:20:42 +00:00
|
|
|
preview_->draw(pi, x, y);
|
2004-04-19 13:05:36 +00:00
|
|
|
else
|
2004-08-14 19:20:42 +00:00
|
|
|
button_.draw(pi, x, y);
|
2002-08-01 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
2007-05-18 14:32:29 +00:00
|
|
|
|
2008-04-27 15:49:15 +00:00
|
|
|
docstring InsetInclude::contextMenu(BufferView const &, int, int) const
|
|
|
|
{
|
|
|
|
return from_ascii("context-include");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-05-18 14:32:29 +00:00
|
|
|
Inset::DisplayType InsetInclude::display() const
|
2004-10-05 10:11:42 +00:00
|
|
|
{
|
2007-10-23 15:02:15 +00:00
|
|
|
return type(params()) == INPUT ? Inline : AlignCenter;
|
2004-08-14 19:20:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-08-01 17:28:59 +00:00
|
|
|
|
|
|
|
//
|
|
|
|
// preview stuff
|
|
|
|
//
|
|
|
|
|
2003-10-10 21:08:55 +00:00
|
|
|
void InsetInclude::fileChanged() const
|
2002-08-01 17:28:59 +00:00
|
|
|
{
|
2007-11-17 15:32:12 +00:00
|
|
|
Buffer const * const buffer = updateFrontend();
|
|
|
|
if (!buffer)
|
2003-10-10 21:08:55 +00:00
|
|
|
return;
|
|
|
|
|
2007-11-17 15:32:12 +00:00
|
|
|
preview_->removePreview(*buffer);
|
|
|
|
add_preview(*preview_.get(), *this, *buffer);
|
|
|
|
preview_->startLoading(*buffer);
|
2002-08-01 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-10-10 21:08:55 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
bool preview_wanted(InsetCommandParams const & params, Buffer const & buffer)
|
2002-08-01 17:28:59 +00:00
|
|
|
{
|
2006-12-27 10:56:11 +00:00
|
|
|
FileName const included_file = includedFilename(buffer, params);
|
2003-09-19 10:16:33 +00:00
|
|
|
|
2003-10-10 21:08:55 +00:00
|
|
|
return type(params) == INPUT && params.preview() &&
|
2007-11-25 11:18:16 +00:00
|
|
|
included_file.isReadableFile();
|
2002-08-01 17:28:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:43:16 +00:00
|
|
|
docstring latexString(InsetInclude const & inset)
|
2002-08-01 17:28:59 +00:00
|
|
|
{
|
2006-10-21 00:16:43 +00:00
|
|
|
odocstringstream os;
|
2007-03-25 16:45:51 +00:00
|
|
|
// We don't need to set runparams.encoding since this will be done
|
|
|
|
// by latex() anyway.
|
2007-03-18 10:59:16 +00:00
|
|
|
OutputParams runparams(0);
|
2003-11-05 12:06:20 +00:00
|
|
|
runparams.flavor = OutputParams::LATEX;
|
2008-02-27 20:43:16 +00:00
|
|
|
inset.latex(os, runparams);
|
2002-08-01 17:28:59 +00:00
|
|
|
|
2003-09-15 11:00:00 +00:00
|
|
|
return os.str();
|
2002-08-01 17:28:59 +00:00
|
|
|
}
|
2002-08-06 14:02:59 +00:00
|
|
|
|
|
|
|
|
2003-10-22 22:26:47 +00:00
|
|
|
void add_preview(RenderMonitoredPreview & renderer, InsetInclude const & inset,
|
|
|
|
Buffer const & buffer)
|
2002-08-06 14:02:59 +00:00
|
|
|
{
|
2003-10-10 21:08:55 +00:00
|
|
|
InsetCommandParams const & params = inset.params();
|
2004-08-14 19:20:42 +00:00
|
|
|
if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
|
2004-04-19 13:31:17 +00:00
|
|
|
preview_wanted(params, buffer)) {
|
2006-12-27 10:56:11 +00:00
|
|
|
renderer.setAbsFile(includedFilename(buffer, params));
|
2008-02-27 20:43:16 +00:00
|
|
|
docstring const snippet = latexString(inset);
|
2003-10-22 22:26:47 +00:00
|
|
|
renderer.addPreview(snippet, buffer);
|
2003-10-10 21:08:55 +00:00
|
|
|
}
|
2002-08-06 14:02:59 +00:00
|
|
|
}
|
|
|
|
|
2003-10-10 21:08:55 +00:00
|
|
|
} // namespace anon
|
|
|
|
|
2002-08-06 14:02:59 +00:00
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
void InsetInclude::addPreview(graphics::PreviewLoader & ploader) const
|
2002-08-06 14:02:59 +00:00
|
|
|
{
|
2003-10-22 22:26:47 +00:00
|
|
|
Buffer const & buffer = ploader.buffer();
|
2008-02-15 14:30:08 +00:00
|
|
|
if (!preview_wanted(params(), buffer))
|
|
|
|
return;
|
|
|
|
preview_->setAbsFile(includedFilename(buffer, params()));
|
2008-02-27 20:43:16 +00:00
|
|
|
docstring const snippet = latexString(*this);
|
2008-02-15 14:30:08 +00:00
|
|
|
preview_->addPreview(snippet, ploader);
|
2002-08-06 14:02:59 +00:00
|
|
|
}
|
2003-03-05 14:59:37 +00:00
|
|
|
|
|
|
|
|
2008-05-13 08:23:44 +00:00
|
|
|
void InsetInclude::addToToc(DocIterator const & cpit)
|
2006-11-13 16:53:49 +00:00
|
|
|
{
|
2008-03-11 09:04:09 +00:00
|
|
|
TocBackend & backend = buffer().tocBackend();
|
|
|
|
|
2007-10-23 15:02:15 +00:00
|
|
|
if (isListings(params())) {
|
2008-03-07 13:33:33 +00:00
|
|
|
if (label_)
|
|
|
|
label_->addToToc(cpit);
|
|
|
|
|
2007-10-23 18:51:04 +00:00
|
|
|
InsetListingsParams p(to_utf8(params()["lstparams"]));
|
2007-10-23 15:02:15 +00:00
|
|
|
string caption = p.getParamValue("caption");
|
2007-10-20 17:35:27 +00:00
|
|
|
if (caption.empty())
|
|
|
|
return;
|
2008-03-11 09:04:09 +00:00
|
|
|
Toc & toc = backend.toc("listing");
|
2008-03-11 10:27:33 +00:00
|
|
|
docstring str = convert<docstring>(toc.size() + 1)
|
2007-10-20 17:35:27 +00:00
|
|
|
+ ". " + from_utf8(caption);
|
2008-05-13 08:23:44 +00:00
|
|
|
DocIterator pit = cpit;
|
2007-10-20 17:35:27 +00:00
|
|
|
toc.push_back(TocItem(pit, 0, str));
|
2007-06-05 17:24:11 +00:00
|
|
|
return;
|
|
|
|
}
|
2008-02-27 20:43:16 +00:00
|
|
|
Buffer const * const childbuffer = getChildBuffer(buffer(), params());
|
2008-04-18 03:11:06 +00:00
|
|
|
if (!childbuffer)
|
2006-11-13 16:53:49 +00:00
|
|
|
return;
|
|
|
|
|
2008-03-11 09:04:09 +00:00
|
|
|
Toc & toc = backend.toc("child");
|
2008-03-11 08:37:30 +00:00
|
|
|
docstring str = childbuffer->fileName().displayName();
|
|
|
|
toc.push_back(TocItem(cpit, 0, str));
|
2008-03-11 08:25:13 +00:00
|
|
|
|
2008-03-11 09:04:09 +00:00
|
|
|
TocList & toclist = backend.tocs();
|
2008-05-20 12:58:54 +00:00
|
|
|
childbuffer->tocBackend().update();
|
2006-11-13 16:53:49 +00:00
|
|
|
TocList const & childtoclist = childbuffer->tocBackend().tocs();
|
|
|
|
TocList::const_iterator it = childtoclist.begin();
|
|
|
|
TocList::const_iterator const end = childtoclist.end();
|
|
|
|
for(; it != end; ++it)
|
|
|
|
toclist[it->first].insert(toclist[it->first].end(),
|
2008-03-11 08:37:30 +00:00
|
|
|
it->second.begin(), it->second.end());
|
2006-11-13 16:53:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-03-07 13:33:33 +00:00
|
|
|
void InsetInclude::updateLabels(ParIterator const & it)
|
2006-11-13 16:53:49 +00:00
|
|
|
{
|
2008-02-27 20:43:16 +00:00
|
|
|
Buffer const * const childbuffer = getChildBuffer(buffer(), params());
|
2008-02-15 14:30:08 +00:00
|
|
|
if (childbuffer) {
|
2007-08-12 21:43:58 +00:00
|
|
|
lyx::updateLabels(*childbuffer, true);
|
2008-02-15 14:30:08 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!isListings(params()))
|
|
|
|
return;
|
|
|
|
|
2008-03-07 13:33:33 +00:00
|
|
|
if (label_)
|
|
|
|
label_->updateLabels(it);
|
|
|
|
|
2008-02-15 14:30:08 +00:00
|
|
|
InsetListingsParams const par(to_utf8(params()["lstparams"]));
|
|
|
|
if (par.getParamValue("caption").empty()) {
|
2008-06-01 18:23:22 +00:00
|
|
|
listings_label_ = buffer().B_("Program Listing");
|
2008-02-15 14:30:08 +00:00
|
|
|
return;
|
|
|
|
}
|
2008-05-20 13:09:35 +00:00
|
|
|
Buffer const & master = *buffer().masterBuffer();
|
|
|
|
Counters & counters = master.params().documentClass().counters();
|
2008-02-15 14:30:08 +00:00
|
|
|
docstring const cnt = from_ascii("listing");
|
2008-05-20 13:09:35 +00:00
|
|
|
listings_label_ = master.B_("Program Listing");
|
2008-02-15 14:30:08 +00:00
|
|
|
if (counters.hasCounter(cnt)) {
|
|
|
|
counters.step(cnt);
|
|
|
|
listings_label_ += " " + convert<docstring>(counters.value(cnt));
|
2007-05-24 14:10:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-21 00:16:43 +00:00
|
|
|
} // namespace lyx
|