#include "lyxlex.h"
#include "metricsinfo.h"
#include "outputparams.h"
+#include "TocBackend.h"
#include "frontends/Alert.h"
#include "frontends/Painter.h"
#include "insets/render_preview.h"
-#include "support/filename.h"
#include "support/filetools.h"
#include "support/lstrings.h" // contains
#include "support/lyxalgo.h"
#include <boost/bind.hpp>
#include <boost/filesystem/operations.hpp>
-#include "support/std_ostream.h"
-
-#include <sstream>
-
namespace lyx {
using support::changeExtension;
using support::contains;
using support::copy;
+using support::DocFileName;
using support::FileName;
using support::getFileContents;
using support::isFileReadable;
}
-string const includedFilename(Buffer const & buffer,
+FileName const includedFilename(Buffer const & buffer,
InsetCommandParams const & params)
{
return makeAbsPath(to_utf8(params["filename"]),
void InsetInclude::read(LyXLex & lex)
{
- params_.read(lex);
+ if (lex.isOK()) {
+ lex.eatLine();
+ string const command = lex.getString();
+ params_.scanCommand(command);
+ }
+ string token;
+ while (lex.isOK()) {
+ lex.next();
+ token = lex.getString();
+ if (token == "\\end_inset")
+ break;
+ if (token == "preview") {
+ lex.next();
+ params_.preview(lex.getBool());
+ } else
+ lex.printError("Unknown parameter name `$$Token' for command " + params_.getCmdName());
+ }
+ if (token != "\\end_inset") {
+ lex.printError("Missing \\end_inset at this point. "
+ "Read: `$$Token'");
+ }
}
if (params_["filename"].empty())
temp += "???";
else
- // FIXME: We don't know the encoding of the filename
- temp += from_ascii(onlyFilename(to_utf8(params_["filename"])));
+ temp += from_utf8(onlyFilename(to_utf8(params_["filename"])));
return temp;
}
if (isVerbatim(params))
return 0;
- string const included_file = includedFilename(buffer, params);
+ string const included_file = includedFilename(buffer, params).absFilename();
if (!isLyXFilename(included_file))
return 0;
if (isVerbatim(params))
return false;
- string const included_file = includedFilename(buffer, params);
- if (!isLyXFilename(included_file))
+ FileName const included_file = includedFilename(buffer, params);
+ if (!isLyXFilename(included_file.absFilename()))
return false;
- Buffer * buf = theBufferList().getBuffer(included_file);
+ Buffer * buf = theBufferList().getBuffer(included_file.absFilename());
if (!buf) {
// the readonly flag can/will be wrong, not anymore I think.
- if (!fs::exists(included_file))
+ if (!fs::exists(included_file.toFilesystemEncoding()))
return false;
- buf = theBufferList().newBuffer(included_file);
+ buf = theBufferList().newBuffer(included_file.absFilename());
if (!loadLyXFile(buf, included_file))
return false;
}
int InsetInclude::latex(Buffer const & buffer, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
string incfile(to_utf8(params_["filename"]));
if (incfile.empty())
return 0;
- string const included_file = includedFilename(buffer, params_);
+ FileName const included_file(includedFilename(buffer, params_));
Buffer const * const m_buffer = buffer.getMasterBuffer();
// if incfile is relative, make it relative to the master
// buffer directory.
if (!absolutePath(incfile)) {
- incfile = makeRelPath(included_file,
+ incfile = makeRelPath(included_file.absFilename(),
m_buffer->filePath());
}
// write it to a file (so far the complete file)
string const exportfile = changeExtension(incfile, ".tex");
- string const mangled = FileName(changeExtension(included_file,
+ string const mangled = DocFileName(changeExtension(included_file.absFilename(),
".tex")).mangledFilename();
- string const writefile = makeAbsPath(mangled, m_buffer->temppath());
+ FileName const writefile(makeAbsPath(mangled, m_buffer->temppath()));
if (!runparams.nice)
incfile = mangled;
// Don't try to load or copy the file
;
else if (loadIfNeeded(buffer, params_)) {
- Buffer * tmp = theBufferList().getBuffer(included_file);
+ Buffer * tmp = theBufferList().getBuffer(included_file.absFilename());
if (tmp->params().textclass != m_buffer->params().textclass) {
// FIXME UNICODE
docstring text = bformat(_("Included file `%1$s'\n"
"has textclass `%2$s'\n"
"while parent file has textclass `%3$s'."),
- makeDisplayPath(included_file),
+ makeDisplayPath(included_file.absFilename()),
from_utf8(tmp->params().getLyXTextClass().name()),
from_utf8(m_buffer->params().getLyXTextClass().name()));
Alert::warning(_("Different textclasses"), text);
lyxerr[Debug::LATEX]
<< to_utf8(bformat(_("Could not copy the file\n%1$s\n"
"into the temporary directory."),
- from_utf8(included_file)))
+ from_utf8(included_file.absFilename())))
<< endl;
return 0;
}
exportfile);
// \input wants file with extension (default is .tex)
- if (!isLyXFilename(included_file)) {
+ if (!isLyXFilename(included_file.absFilename())) {
incfile = latex_path(incfile);
// FIXME UNICODE
os << '\\' << from_ascii(params_.getCmdName())
int InsetInclude::plaintext(Buffer const & buffer, odocstream & os,
- OutputParams const &) const
+ OutputParams const &) const
{
if (isVerbatim(params_)) {
+ os << '[' << getScreenLabel(buffer) << '\n';
// FIXME: We don't know the encoding of the file
- docstring const str = from_utf8(
- getFileContents(includedFilename(buffer, params_)));
+ docstring const str =
+ from_utf8(getFileContents(includedFilename(buffer, params_)));
+ os << str;
+ os << "\n]";
+ return PLAINTEXT_NEWLINE + 1; // one char on a separate line
+ } else {
+ docstring const str = '[' + getScreenLabel(buffer) + ']';
os << str;
- // Return how many newlines we issued.
- return int(lyx::count(str.begin(), str.end(), '\n'));
+ return str.size();
}
- return 0;
}
int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
string incfile = to_utf8(params_["filename"]);
if (incfile.empty())
return 0;
- string const included_file = includedFilename(buffer, params_);
+ string const included_file = includedFilename(buffer, params_).absFilename();
// write it to a file (so far the complete file)
string const exportfile = changeExtension(incfile, ".sgml");
- string writefile = changeExtension(included_file, ".sgml");
+ DocFileName writefile(changeExtension(included_file, ".sgml"));
if (loadIfNeeded(buffer, params_)) {
Buffer * tmp = theBufferList().getBuffer(included_file);
- string const mangled = FileName(writefile).mangledFilename();
+ string const mangled = writefile.mangledFilename();
writefile = makeAbsPath(mangled,
buffer.getMasterBuffer()->temppath());
if (!runparams.nice)
runparams.exportdata->addExternalFile("docbook-xml", writefile,
exportfile);
- // FIXME UNICODE
if (isVerbatim(params_)) {
os << "<inlinegraphic fileref=\""
<< '&' << include_label << ';'
Buffer const & buffer = features.buffer();
- string const included_file = includedFilename(buffer, params_);
+ string const included_file = includedFilename(buffer, params_).absFilename();
if (isLyXFilename(included_file))
writefile = changeExtension(included_file, ".sgml");
writefile = included_file;
if (!features.runparams().nice && !isVerbatim(params_)) {
- incfile = FileName(writefile).mangledFilename();
+ incfile = DocFileName(writefile).mangledFilename();
writefile = makeAbsPath(incfile,
- buffer.getMasterBuffer()->temppath());
+ buffer.getMasterBuffer()->temppath()).absFilename();
}
features.includeFile(include_label, writefile);
std::vector<docstring> & list) const
{
if (loadIfNeeded(buffer, params_)) {
- string const included_file = includedFilename(buffer, params_);
+ string const included_file = includedFilename(buffer, params_).absFilename();
Buffer * tmp = theBufferList().getBuffer(included_file);
tmp->setParentName("");
tmp->getLabelList(list);
void InsetInclude::fillWithBibKeys(Buffer const & buffer,
- std::vector<std::pair<string,string> > & keys) const
+ std::vector<std::pair<string, docstring> > & keys) const
{
if (loadIfNeeded(buffer, params_)) {
- string const included_file = includedFilename(buffer, params_);
+ string const included_file = includedFilename(buffer, params_).absFilename();
Buffer * tmp = theBufferList().getBuffer(included_file);
tmp->setParentName("");
tmp->fillWithBibKeys(keys);
}
-std::vector<string> const &
+std::vector<FileName> const &
InsetInclude::getBibfilesCache(Buffer const & buffer) const
{
Buffer * const tmp = getChildBuffer(buffer, params_);
if (tmp) {
tmp->setParentName("");
- std::vector<string> const & cache = tmp->getBibfilesCache();
+ std::vector<FileName> const & cache = tmp->getBibfilesCache();
tmp->setParentName(parentFilename(buffer));
return cache;
}
- static std::vector<string> const empty;
+ static std::vector<FileName> const empty;
return empty;
}
-void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
{
BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer());
Box b(0, dim.wid, -dim.asc, dim.des);
button_.setBox(b);
+ bool const changed = dim_ != dim;
dim_ = dim;
+ return changed;
}
bool preview_wanted(InsetCommandParams const & params, Buffer const & buffer)
{
- string const included_file = includedFilename(buffer, params);
+ FileName const included_file = includedFilename(buffer, params);
return type(params) == INPUT && params.preview() &&
isFileReadable(included_file);
docstring const latex_string(InsetInclude const & inset, Buffer const & buffer)
{
odocstringstream os;
- OutputParams runparams;
+ OutputParams runparams(0);
runparams.flavor = OutputParams::LATEX;
inset.latex(buffer, os, runparams);
}
+void InsetInclude::addToToc(TocList & toclist, Buffer const & buffer) const
+{
+ Buffer const * const childbuffer = getChildBuffer(buffer, params_);
+ if (!childbuffer)
+ return;
+
+ 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(),
+ it->second.begin(), it->second.end());
+}
+
+
+void InsetInclude::updateLabels(Buffer const & buffer) const
+{
+ Buffer const * const childbuffer = getChildBuffer(buffer, params_);
+ if (!childbuffer)
+ return;
+
+ lyx::updateLabels(*childbuffer, true);
+}
+
+
string const InsetIncludeMailer::name_("include");
InsetIncludeMailer::InsetIncludeMailer(InsetInclude & inset)
projects / lyx.git / blobdiff