*
* \author Lars Gullik Bjønnes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
paragraphs.clear();
- // Remove any previewed LaTeX snippets assocoated with this buffer.
- lyx::graphics::Previews::get().removeLoader(this);
+ // Remove any previewed LaTeX snippets associated with this buffer.
+ lyx::graphics::Previews::get().removeLoader(*this);
}
{
Alert::warning(_("Unknown document class"),
bformat(_("Using the default document class, because the "
- " class %1$s is unknown."), unknown));
+ "class %1$s is unknown."), unknown));
}
} // anon
// changed to be public and have one parameter
// if par = 0 normal behavior
// else insert behavior
-// Returns false if "\the_end" is not read (Asger)
+// Returns false if "\end_document" is not read (Asger)
bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit)
{
Paragraph::depth_type depth = 0;
lyxerr[Debug::PARSER] << "Handling token: `"
<< token << '\'' << endl;
- if (token == "\\the_end") {
+ if (token == "\\end_document") {
the_end_read = true;
continue;
}
static Change current_change;
int unknown = 0;
- if (token == "\\layout") {
+ if (token == "\\begin_layout") {
lex.pushToken(token);
Paragraph par;
}
-bool Buffer::readFile(LyXLex & lex, string const & filename)
+bool Buffer::readFile(string const & filename)
{
- bool ret = readFile(lex, filename, paragraphs.begin());
+ // Check if the file is compressed.
+ string const format = getExtFromContents(filename);
+ if (format == "gzip" || format == "zip" || format == "compress") {
+ params.compressed = true;
+ }
+
+ bool ret = readFile(filename, paragraphs.begin());
// After we have read a file, we must ensure that the buffer
// language is set and used in the gui.
}
-// FIXME: all the below Alerts should give the filename..
+bool Buffer::readFile(string const & filename, ParagraphList::iterator pit)
+{
+ LyXLex lex(0, 0);
+ lex.setFile(filename);
+
+ return readFile(lex, filename, pit);
+}
+
+
bool Buffer::readFile(LyXLex & lex, string const & filename,
ParagraphList::iterator pit)
{
+ Assert(!filename.empty());
+
if (!lex.isOK()) {
Alert::error(_("Document could not be read"),
- _("The specified document could not be read."));
+ bformat(_("%1$s could not be read."), filename));
return false;
}
if (!lex.isOK()) {
Alert::error(_("Document could not be read"),
- _("The specified document could not be read."));
+ bformat(_("%1$s could not be read."), filename));
return false;
}
// the first token _must_ be...
if (token != "\\lyxformat") {
+ lyxerr << "Token: " << token << endl;
+
Alert::error(_("Document format failure"),
- _("The specified document is not a LyX document."));
+ bformat(_("%1$s is not a LyX document."),
+ filename));
return false;
}
//lyxerr << " dot found at " << dot << endl;
if (dot != string::npos)
tmp_format.erase(dot, 1);
- file_format = strToInt(tmp_format);
+ int file_format = strToInt(tmp_format);
//lyxerr << "format: " << file_format << endl;
- if (file_format == LYX_FORMAT) {
- // current format
- } else if (file_format > LYX_FORMAT) {
+
+ if (file_format > LYX_FORMAT) {
Alert::warning(_("Document format failure"),
- _("This document was created with a newer version of "
- "LyX. This is likely to cause problems."));
+ bformat(_("%1$s was created with a newer"
+ " version of LyX. This is likely to"
+ " cause problems."),
+ filename));
} else if (file_format < LYX_FORMAT) {
- // old formats
- if (file_format < 200) {
- Alert::error(_("Document format failure"),
- _("This LyX document is too old to be read "
- "by this version of LyX. Try LyX 0.10."));
+ string const tmpfile = tempName();
+ string command = LibFileSearch("lyx2lyx", "lyx2lyx");
+ if (command.empty()) {
+ Alert::error(_("Conversion script not found"),
+ bformat(_("%1$s is from an earlier"
+ " version of LyX, but the"
+ " conversion script lyx2lyx"
+ " could not be found."),
+ filename));
return false;
- } else if (!filename.empty()) {
- string command =
- LibFileSearch("lyx2lyx", "lyx2lyx");
- if (command.empty()) {
- Alert::error(_("Conversion script not found"),
- _("The document is from an earlier version "
- "of LyX, but the conversion script lyx2lyx "
- "could not be found."));
- return false;
- }
- command += " -t"
- +tostr(LYX_FORMAT) + ' '
- + QuoteName(filename);
- lyxerr[Debug::INFO] << "Running '"
- << command << '\''
- << endl;
- cmd_ret const ret = RunCommand(command);
- if (ret.first) {
- Alert::error(_("Conversion script failed"),
- _("The document is from an earlier version "
- "of LyX, but the lyx2lyx script failed "
- "to convert it."));
- return false;
- }
- istringstream is(STRCONV(ret.second));
- LyXLex tmplex(0, 0);
- tmplex.setStream(is);
- return readFile(tmplex, string(), pit);
- } else {
- // This code is reached if lyx2lyx failed (for
- // some reason) to change the file format of
- // the file.
- Assert(false);
+ }
+ command += " -t"
+ + tostr(LYX_FORMAT)
+ + " -o " + tmpfile + ' '
+ + QuoteName(filename);
+ lyxerr[Debug::INFO] << "Running '"
+ << command << '\''
+ << endl;
+ cmd_ret const ret = RunCommand(command);
+ if (ret.first != 0) {
+ Alert::error(_("Conversion script failed"),
+ bformat(_("%1$s is from an earlier version"
+ " of LyX, but the lyx2lyx script"
+ " failed to convert it."),
+ filename));
return false;
+ } else {
+ bool ret = readFile(tmpfile, pit);
+ // Do stuff with tmpfile name and buffer name here.
+ return ret;
}
+
}
+
bool the_end = readBody(lex, pit);
params.setPaperStuff();
if (!the_end) {
Alert::error(_("Document format failure"),
- _("The document ended unexpectedly, which means "
- "that it is probably corrupted."));
+ bformat(_("%1$s ended unexpectedly, which means"
+ " that it is probably corrupted."),
+ filename));
}
return true;
}
return false;
}
- bool const compressed = (fname.substr(fname.size() - 3, 3) == ".gz");
+ bool retval;
- if (compressed) {
+ if (params.compressed) {
gz::ogzstream ofs(fname.c_str());
if (!ofs)
return false;
- return do_writeFile(ofs);
+ retval = do_writeFile(ofs);
- }
+ } else {
+ ofstream ofs(fname.c_str());
+ if (!ofs)
+ return false;
- ofstream ofs(fname.c_str());
- if (!ofs)
- return false;
+ retval = do_writeFile(ofs);
+ }
- return do_writeFile(ofs);
+ return retval;
}
// The top of the file should not be written by params.
// write out a comment in the top of the file
- ofs << '#' << lyx_docversion
+ ofs << "#LyX " << lyx_version
<< " created this file. For more info see http://www.lyx.org/\n"
<< "\\lyxformat " << LYX_FORMAT << "\n";
ParagraphList::const_iterator pit = paragraphs.begin();
ParagraphList::const_iterator pend = paragraphs.end();
for (; pit != pend; ++pit)
- pit->write(this, ofs, params, depth);
+ pit->write(*this, ofs, params, depth);
// Write marker that shows file is complete
- ofs << "\n\\the_end" << endl;
+ ofs << "\n\\end_document" << endl;
// Shouldn't really be needed....
//ofs.close();
currlinelen += word.length();
word.erase();
}
- if (inset->ascii(this, buffer, linelen)) {
+ if (inset->ascii(*this, buffer, linelen)) {
// to be sure it breaks paragraph
currlinelen += linelen;
}
texrow.start(paragraphs.begin()->id(), 0);
if (output_preamble && runparams.nice) {
- os << "%% " << lyx_docversion << " created this file. "
+ os << "%% LyX " << lyx_version << " created this file. "
"For more info, see http://www.lyx.org/.\n"
"%% Do not edit unless you really know what "
"you are doing.\n";
texrow.newline();
}
- latexParagraphs(this, paragraphs, os, texrow, runparams);
+ latexParagraphs(*this, paragraphs, os, texrow, runparams);
// add this just in case after all the paragraphs
os << endl;
}
}
- ofs << "<!-- " << lyx_docversion
+ ofs << "<!-- LyX " << lyx_version
<< " created this file. For more info see http://www.lyx.org/"
<< " -->\n";
if (c == Paragraph::META_INSET) {
InsetOld * inset = par->getInset(i);
- inset->linuxdoc(this, os);
+ inset->linuxdoc(*this, os);
font_old = font;
continue;
}
}
sgml::openTag(ofs, 0, false, top);
- ofs << "<!-- DocBook file was created by " << lyx_docversion
+ ofs << "<!-- DocBook file was created by LyX " << lyx_version
<< "\n See http://www.lyx.org/ for more information -->\n";
vector<string> environment_stack(10);
if (i || desc_on != 3) {
if (style->latexparam() == "CDATA")
os << "]]>";
- inset->docbook(this, os, false);
+ inset->docbook(*this, os, false);
if (style->latexparam() == "CDATA")
os << "<
projects / lyx.git / blobdiff