#include "lyxlex.h"
#include "metricsinfo.h"
#include "outputparams.h"
+#include "TocBackend.h"
#include "frontends/Alert.h"
#include "frontends/Painter.h"
#include <boost/bind.hpp>
#include <boost/filesystem/operations.hpp>
-#include "support/std_ostream.h"
-
-#include <sstream>
-
-using lyx::docstring;
-using lyx::support::addName;
-using lyx::support::absolutePath;
-using lyx::support::bformat;
-using lyx::support::changeExtension;
-using lyx::support::contains;
-using lyx::support::copy;
-using lyx::support::FileName;
-using lyx::support::getFileContents;
-using lyx::support::isFileReadable;
-using lyx::support::isLyXFilename;
-using lyx::support::latex_path;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::makeRelPath;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::subst;
-using lyx::support::sum;
+
+namespace lyx {
+
+using support::addName;
+using support::absolutePath;
+using support::bformat;
+using support::changeExtension;
+using support::contains;
+using support::copy;
+using support::DocFileName;
+using support::getFileContents;
+using support::isFileReadable;
+using support::isLyXFilename;
+using support::latex_path;
+using support::makeAbsPath;
+using support::makeDisplayPath;
+using support::makeRelPath;
+using support::onlyFilename;
+using support::onlyPath;
+using support::subst;
+using support::sum;
using std::endl;
using std::string;
using std::ostream;
using std::ostringstream;
-namespace Alert = lyx::frontend::Alert;
+namespace Alert = frontend::Alert;
namespace fs = boost::filesystem;
namespace {
-string const uniqueID()
+docstring const uniqueID()
{
static unsigned int seed = 1000;
- return "file" + convert<string>(++seed);
+ return "file" + convert<docstring>(++seed);
}
} // namespace anon
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
- InsetCommandParams p;
- InsetIncludeMailer::string2params(lyx::to_utf8(cmd.argument()), p);
+ InsetCommandParams p("include");
+ InsetIncludeMailer::string2params(to_utf8(cmd.argument()), p);
if (!p.getCmdName().empty()) {
set(p, cur.buffer());
cur.buffer().updateBibfilesCache();
string const includedFilename(Buffer const & buffer,
InsetCommandParams const & params)
{
- return makeAbsPath(params.getContents(),
+ return makeAbsPath(to_utf8(params["filename"]),
onlyPath(parentFilename(buffer)));
}
void InsetInclude::write(ostream & os) const
{
- os << "Include " << params_.getCommand() << '\n'
+ os << "Include " << to_utf8(params_.getCommand()) << '\n'
<< "preview " << convert<string>(params_.preview()) << '\n';
}
void InsetInclude::read(LyXLex & lex)
{
- params_.read(lex);
+ if (lex.isOK()) {
+ lex.next();
+ 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'");
+ }
}
temp += ": ";
- if (params_.getContents().empty())
+ if (params_["filename"].empty())
temp += "???";
else
// FIXME: We don't know the encoding of the filename
- temp += lyx::from_ascii(onlyFilename(params_.getContents()));
+ temp += from_ascii(onlyFilename(to_utf8(params_["filename"])));
return temp;
}
} // namespace anon
-int InsetInclude::latex(Buffer const & buffer, ostream & os,
+int InsetInclude::latex(Buffer const & buffer, odocstream & os,
OutputParams const & runparams) const
{
- string incfile(params_.getContents());
+ string incfile(to_utf8(params_["filename"]));
// Do nothing if no file name has been specified
if (incfile.empty())
// 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,
".tex")).mangledFilename();
string const writefile = makeAbsPath(mangled, m_buffer->temppath());
"has textclass `%2$s'\n"
"while parent file has textclass `%3$s'."),
makeDisplayPath(included_file),
- lyx::from_utf8(tmp->params().getLyXTextClass().name()),
- lyx::from_utf8(m_buffer->params().getLyXTextClass().name()));
+ from_utf8(tmp->params().getLyXTextClass().name()),
+ from_utf8(m_buffer->params().getLyXTextClass().name()));
Alert::warning(_("Different textclasses"), text);
//return 0;
}
if (!copy(included_file, writefile)) {
// FIXME UNICODE
lyxerr[Debug::LATEX]
- << lyx::to_utf8(bformat(_("Could not copy the file\n%1$s\n"
+ << to_utf8(bformat(_("Could not copy the file\n%1$s\n"
"into the temporary directory."),
- lyx::from_utf8(included_file)))
+ from_utf8(included_file)))
<< endl;
return 0;
}
"latex" : "pdflatex";
if (isVerbatim(params_)) {
incfile = latex_path(incfile);
- os << '\\' << params_.getCmdName() << '{' << incfile << '}';
+ // FIXME UNICODE
+ os << '\\' << from_ascii(params_.getCmdName()) << '{'
+ << from_utf8(incfile) << '}';
} else if (type(params_) == INPUT) {
runparams.exportdata->addExternalFile(tex_format, writefile,
exportfile);
// \input wants file with extension (default is .tex)
if (!isLyXFilename(included_file)) {
incfile = latex_path(incfile);
- os << '\\' << params_.getCmdName() << '{' << incfile << '}';
+ // FIXME UNICODE
+ os << '\\' << from_ascii(params_.getCmdName())
+ << '{' << from_utf8(incfile) << '}';
} else {
incfile = changeExtension(incfile, ".tex");
incfile = latex_path(incfile);
- os << '\\' << params_.getCmdName() << '{'
- << incfile
- << '}';
+ // FIXME UNICODE
+ os << '\\' << from_ascii(params_.getCmdName())
+ << '{' << from_utf8(incfile) << '}';
}
} else {
runparams.exportdata->addExternalFile(tex_format, writefile,
// file really have .tex
incfile = changeExtension(incfile, string());
incfile = latex_path(incfile);
- os << '\\' << params_.getCmdName() << '{'
- << incfile
- << '}';
+ // FIXME UNICODE
+ os << '\\' << from_ascii(params_.getCmdName()) << '{'
+ << from_utf8(incfile) << '}';
}
return 0;
}
-int InsetInclude::plaintext(Buffer const & buffer, lyx::odocstream & os,
+int InsetInclude::plaintext(Buffer const & buffer, odocstream & os,
OutputParams const &) const
{
if (isVerbatim(params_)) {
// FIXME: We don't know the encoding of the file
- docstring const str = lyx::from_utf8(
+ docstring const str = from_utf8(
getFileContents(includedFilename(buffer, params_)));
os << str;
// Return how many newlines we issued.
}
-int InsetInclude::docbook(Buffer const & buffer, ostream & os,
+int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
OutputParams const & runparams) const
{
- string incfile(params_.getContents());
+ string incfile = to_utf8(params_["filename"]);
// Do nothing if no file name has been specified
if (incfile.empty())
if (loadIfNeeded(buffer, params_)) {
Buffer * tmp = theBufferList().getBuffer(included_file);
- string const mangled = FileName(writefile).mangledFilename();
+ string const mangled = DocFileName(writefile).mangledFilename();
writefile = makeAbsPath(mangled,
buffer.getMasterBuffer()->temppath());
if (!runparams.nice)
<< '&' << include_label << ';'
<< "\" format=\"linespecific\">";
} else
- os << '&' << include_label << ';';
+ os << '&' << include_label << ';';
return 0;
}
void InsetInclude::validate(LaTeXFeatures & features) const
{
- string incfile(params_.getContents());
+ string incfile(to_utf8(params_["filename"]));
string writefile;
Buffer const & buffer = features.buffer();
writefile = included_file;
if (!features.runparams().nice && !isVerbatim(params_)) {
- incfile = FileName(writefile).mangledFilename();
+ incfile = DocFileName(writefile).mangledFilename();
writefile = makeAbsPath(incfile,
buffer.getMasterBuffer()->temppath());
}
bool use_preview = false;
if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {
- lyx::graphics::PreviewImage const * pimage =
+ graphics::PreviewImage const * pimage =
preview_->getPreviewImage(*mi.base.bv->buffer());
use_preview = pimage && pimage->image();
}
bool use_preview = false;
if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {
- lyx::graphics::PreviewImage const * pimage =
+ graphics::PreviewImage const * pimage =
preview_->getPreviewImage(*pi.base.bv->buffer());
use_preview = pimage && pimage->image();
}
}
-string const latex_string(InsetInclude const & inset, Buffer const & buffer)
+docstring const latex_string(InsetInclude const & inset, Buffer const & buffer)
{
- ostringstream os;
+ odocstringstream os;
OutputParams runparams;
runparams.flavor = OutputParams::LATEX;
inset.latex(buffer, os, runparams);
if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
preview_wanted(params, buffer)) {
renderer.setAbsFile(includedFilename(buffer, params));
- string const snippet = latex_string(inset, buffer);
+ docstring const snippet = latex_string(inset, buffer);
renderer.addPreview(snippet, buffer);
}
}
} // namespace anon
-void InsetInclude::addPreview(lyx::graphics::PreviewLoader & ploader) const
+void InsetInclude::addPreview(graphics::PreviewLoader & ploader) const
{
Buffer const & buffer = ploader.buffer();
if (preview_wanted(params(), buffer)) {
preview_->setAbsFile(includedFilename(buffer, params()));
- string const snippet = latex_string(*this, buffer);
+ docstring const snippet = latex_string(*this, buffer);
preview_->addPreview(snippet, ploader);
}
}
+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)
void InsetIncludeMailer::string2params(string const & in,
InsetCommandParams & params)
{
- params = InsetCommandParams();
+ params.clear();
if (in.empty())
return;
data << "\\end_inset\n";
return data.str();
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff