X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=4e58256a87bc50d981f51242280fff63556373a5;hb=6a55be9506b112110826cf63bc21786044569f1d;hp=d2f07cf19e3a936b7a9dc258ce94327ae9a2dd75;hpb=25bf63f1a189c4e0cb9f85ca77af9ee9fa6049f1;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index d2f07cf19e..4e58256a87 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -71,20 +71,20 @@ #include "support/path.h" #include "support/textutils.h" #include "support/tostr.h" -#include "support/std_sstream.h" #include +#include + #include #include +#include -#include using lyx::pos_type; -using lyx::par_type; +using lyx::pit_type; using lyx::support::AddName; -using lyx::support::atoi; using lyx::support::bformat; using lyx::support::ChangeExtension; using lyx::support::cmd_ret; @@ -92,7 +92,7 @@ using lyx::support::createBufferTmpDir; using lyx::support::destroyDir; using lyx::support::FileInfo; using lyx::support::FileInfo; -using lyx::support::getExtFromContents; +using lyx::support::getFormatFromContents; using lyx::support::IsDirWriteable; using lyx::support::IsFileWriteable; using lyx::support::LibFileSearch; @@ -136,7 +136,7 @@ extern BufferList bufferlist; namespace { -const int LYX_FORMAT = 235; +int const LYX_FORMAT = 238; } // namespace anon @@ -319,7 +319,7 @@ TexRow const & Buffer::texrow() const } -string const Buffer::getLatexName(bool no_path) const +string const Buffer::getLatexName(bool const no_path) const { string const name = ChangeExtension(MakeLatexName(fileName()), ".tex"); return no_path ? OnlyFilename(name) : name; @@ -358,7 +358,7 @@ pair const Buffer::getLogName() const } -void Buffer::setReadonly(bool flag) +void Buffer::setReadonly(bool const flag) { if (pimpl_->read_only != flag) { pimpl_->read_only = flag; @@ -392,9 +392,11 @@ void unknownClass(string const & unknown) int Buffer::readHeader(LyXLex & lex) { int unknown_tokens = 0; + int line = -1; + int begin_header_line = -1; while (lex.isOK()) { - lex.nextToken(); + lex.next(); string const token = lex.getString(); if (token.empty()) @@ -403,13 +405,18 @@ int Buffer::readHeader(LyXLex & lex) if (token == "\\end_header") break; + ++line; + if (token == "\\begin_header") { + begin_header_line = line; + continue; + } + lyxerr[Debug::PARSER] << "Handling header token: `" << token << '\'' << endl; - string unknown = params().readToken(lex, token); if (!unknown.empty()) { - if (unknown[0] != '\\') { + if (unknown[0] != '\\' and token == "\\textclass") { unknownClass(unknown); } else { ++unknown_tokens; @@ -422,6 +429,10 @@ int Buffer::readHeader(LyXLex & lex) } } } + if (begin_header_line) { + string const s = _("\\begin_header is missing"); + error(ErrorItem(_("Header error"), s, -1, 0, 0)); + } return unknown_tokens; } @@ -429,8 +440,15 @@ int Buffer::readHeader(LyXLex & lex) // Uwe C. Schroeder // changed to be public and have one parameter // Returns false if "\end_document" is not read (Asger) -bool Buffer::readBody(LyXLex & lex) +bool Buffer::readDocument(LyXLex & lex) { + lex.next(); + string const token = lex.getString(); + if (token != "\\begin_document") { + string const s = _("\\begin_document is missing"); + error(ErrorItem(_("Header error"), s, -1, 0, 0)); + } + if (paragraphs().empty()) { readHeader(lex); if (!params().getLyXTextClass().load()) { @@ -455,8 +473,8 @@ bool Buffer::readBody(LyXLex & lex) // needed to insert the selection void Buffer::insertStringAsLines(ParagraphList & pars, - par_type & par, pos_type & pos, - LyXFont const & fn, string const & str) + pit_type & par, pos_type & pos, + LyXFont const & fn, string const & str, bool autobreakrows) { LyXLayout_ptr const & layout = pars[par].layout(); @@ -465,7 +483,6 @@ void Buffer::insertStringAsLines(ParagraphList & pars, pars[par].checkInsertChar(font); // insert the string, don't insert doublespace bool space_inserted = true; - bool autobreakrows = pars[par].autoBreakRows(); for (string::const_iterator cit = str.begin(); cit != str.end(); ++cit) { if (*cit == '\n') { @@ -513,7 +530,7 @@ void Buffer::insertStringAsLines(ParagraphList & pars, bool Buffer::readFile(string const & filename) { // Check if the file is compressed. - string const format = getExtFromContents(filename); + string const format = getFormatFromContents(filename); if (format == "gzip" || format == "zip" || format == "compress") { params().compressed = true; } @@ -531,7 +548,7 @@ bool Buffer::readFile(string const & filename) } -bool Buffer::readFile(string const & filename, par_type pit) +bool Buffer::readFile(string const & filename, pit_type const pit) { LyXLex lex(0, 0); lex.setFile(filename); @@ -545,13 +562,13 @@ bool Buffer::fully_loaded() const } -void Buffer::fully_loaded(bool value) +void Buffer::fully_loaded(bool const value) { pimpl_->file_fully_loaded = value; } -bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit) +bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit) { BOOST_ASSERT(!filename.empty()); @@ -580,7 +597,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit) return false; } - lex.eatLine(); + lex.next(); string tmp_format = lex.getString(); //lyxerr << "LyX Format: `" << tmp_format << '\'' << endl; // if present remove ".," from string. @@ -591,13 +608,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit) int file_format = strToInt(tmp_format); //lyxerr << "format: " << file_format << endl; - if (file_format > LYX_FORMAT) { - Alert::warning(_("Document format failure"), - bformat(_("%1$s was created with a newer" - " version of LyX. This is likely to" - " cause problems."), - filename)); - } else if (file_format < LYX_FORMAT) { + if (file_format != LYX_FORMAT) { string const tmpfile = tempName(); if (tmpfile.empty()) { Alert::error(_("Conversion failed"), @@ -619,7 +630,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit) return false; } command += " -t" - + tostr(LYX_FORMAT) + + convert(LYX_FORMAT) + " -o " + tmpfile + ' ' + QuoteName(filename); lyxerr[Debug::INFO] << "Running '" @@ -641,26 +652,18 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit) } - bool the_end = readBody(lex); - //lyxerr << "removing " << MacroTable::localMacros().size() - // << " temporary macro entries" << endl; - //MacroTable::localMacros().clear(); - params().setPaperStuff(); - -#ifdef WITH_WARNINGS -#warning Look here! -#endif -#if 0 - if (token == "\\end_document") - the_end_read = true; - - if (!the_end) { + if (readDocument(lex)) { Alert::error(_("Document format failure"), bformat(_("%1$s ended unexpectedly, which means" " that it is probably corrupted."), filename)); } -#endif + + //lyxerr << "removing " << MacroTable::localMacros().size() + // << " temporary macro entries" << endl; + //MacroTable::localMacros().clear(); + params().setPaperStuff(); + pimpl_->file_fully_loaded = true; return true; } @@ -678,7 +681,7 @@ bool Buffer::save() const s = fileName() + '~'; if (!lyxrc.backupdir_path.empty()) s = AddName(lyxrc.backupdir_path, - subst(os::slashify_path(s),'/','!')); + subst(os::internal_path(s),'/','!')); // Rename is the wrong way of making a backup, // this is the correct way. @@ -750,7 +753,7 @@ bool Buffer::writeFile(string const & fname) const if (finfo.exist() && !finfo.writable()) return false; - bool retval; + bool retval = false; if (params().compressed) { gz::ogzstream ofs(fname.c_str()); @@ -783,18 +786,21 @@ bool Buffer::do_writeFile(ostream & ofs) const // write out a comment in the top of the file ofs << "#LyX " << lyx_version << " created this file. For more info see http://www.lyx.org/\n" - << "\\lyxformat " << LYX_FORMAT << "\n"; + << "\\lyxformat " << LYX_FORMAT << "\n" + << "\\begin_document\n"; // now write out the buffer parameters. + ofs << "\\begin_header\n"; params().writeFile(ofs); - ofs << "\\end_header\n"; // write the text + ofs << "\n\\begin_body\n"; text().write(*this, ofs); + ofs << "\n\\end_body\n"; // Write marker that shows file is complete - ofs << "\n\\end_document" << endl; + ofs << "\\end_document" << endl; // Shouldn't really be needed.... //ofs.close(); @@ -840,7 +846,7 @@ void Buffer::makeLaTeXFile(string const & fname, void Buffer::makeLaTeXFile(ostream & os, string const & original_path, OutputParams const & runparams_in, - bool output_preamble, bool output_body) + bool const output_preamble, bool const output_body) { OutputParams runparams = runparams_in; @@ -851,6 +857,7 @@ void Buffer::makeLaTeXFile(ostream & os, lyxerr[Debug::LATEX] << " Buffer validation done." << endl; texrow().reset(); + // The starting paragraph of the coming rows is the // first paragraph of the document. (Asger) texrow().start(paragraphs().begin()->id(), 0); @@ -993,7 +1000,7 @@ bool Buffer::isSGML() const void Buffer::makeLinuxDocFile(string const & fname, OutputParams const & runparams, - bool body_only) + bool const body_only) { ofstream ofs; if (!openFileWrite(ofs, fname)) @@ -1006,7 +1013,7 @@ void Buffer::makeLinuxDocFile(string const & fname, LyXTextClass const & tclass = params().getLyXTextClass(); - string top_element = tclass.latexname(); + string const & top_element = tclass.latexname(); if (!body_only) { ofs << tclass.class_header(); @@ -1023,12 +1030,12 @@ void Buffer::makeLinuxDocFile(string const & fname, ofs << ">\n\n"; if (params().options.empty()) - sgml::openTag(ofs, 0, false, top_element); + sgml::openTag(ofs, top_element); else { string top = top_element; top += ' '; top += params().options; - sgml::openTag(ofs, 0, false, top); + sgml::openTag(ofs, top); } } @@ -1040,7 +1047,7 @@ void Buffer::makeLinuxDocFile(string const & fname, if (!body_only) { ofs << "\n\n"; - sgml::closeTag(ofs, 0, false, top_element); + sgml::closeTag(ofs, top_element); } ofs.close(); @@ -1051,7 +1058,7 @@ void Buffer::makeLinuxDocFile(string const & fname, void Buffer::makeDocBookFile(string const & fname, OutputParams const & runparams, - bool only_body) + bool const only_body) { ofstream ofs; if (!openFileWrite(ofs, fname)) @@ -1063,7 +1070,7 @@ void Buffer::makeDocBookFile(string const & fname, texrow().reset(); LyXTextClass const & tclass = params().getLyXTextClass(); - string top_element = tclass.latexname(); + string const & top_element = tclass.latexname(); if (!only_body) { if (runparams.flavor == OutputParams::XML) @@ -1078,8 +1085,15 @@ void Buffer::makeDocBookFile(string const & fname, << "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\""; else ofs << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\""; - + string preamble = params().preamble; + if (runparams.flavor != OutputParams::XML ) { + preamble += "\n"; + preamble += "\n"; + preamble += "\n"; + preamble += "\n"; + } + string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml") : fname; preamble += features.getIncludedFiles(name); @@ -1103,17 +1117,17 @@ void Buffer::makeDocBookFile(string const & fname, top += ' '; top += params().options; } - sgml::openTag(ofs, 0, false, top); ofs << "\n"; params().getLyXTextClass().counters().reset(); - docbookParagraphs(*this, paragraphs(), ofs, runparams); - ofs << "\n\n"; - sgml::closeTag(ofs, 0, false, top_element); + sgml::openTag(ofs, top); + ofs << '\n'; + docbookParagraphs(paragraphs(), *this, ofs, runparams); + sgml::closeTag(ofs, top_element); ofs.close(); if (ofs.fail()) @@ -1143,7 +1157,7 @@ int Buffer::runChktex() TeXErrors terr; Chktex chktex(lyxrc.chktex_command, name, filePath()); - int res = chktex.run(terr); // run chktex + int const res = chktex.run(terr); // run chktex if (res == -1) { Alert::error(_("chktex failure"), @@ -1206,7 +1220,7 @@ void Buffer::validate(LaTeXFeatures & features) const } -void Buffer::getLabelList(std::vector & list) const +void Buffer::getLabelList(vector & list) const { /// if this is a child document and the parent is already loaded /// Use the parent's list instead [ale990407] @@ -1226,7 +1240,7 @@ void Buffer::getLabelList(std::vector & list) const // This is also a buffer property (ale) -void Buffer::fillWithBibKeys(std::vector > & keys) +void Buffer::fillWithBibKeys(vector > & keys) const { /// if this is a child document and the parent is already loaded @@ -1239,15 +1253,15 @@ void Buffer::fillWithBibKeys(std::vector > & keys) } for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) { - if (it->lyxCode() == InsetOld::BIBTEX_CODE) { + if (it->lyxCode() == InsetBase::BIBTEX_CODE) { InsetBibtex const & inset = dynamic_cast(*it); inset.fillWithBibKeys(*this, keys); - } else if (it->lyxCode() == InsetOld::INCLUDE_CODE) { + } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) { InsetInclude const & inset = dynamic_cast(*it); inset.fillWithBibKeys(*this, keys); - } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) { + } else if (it->lyxCode() == InsetBase::BIBITEM_CODE) { InsetBibitem const & inset = dynamic_cast(*it); string const key = inset.getContents(); @@ -1262,7 +1276,7 @@ void Buffer::fillWithBibKeys(std::vector > & keys) bool Buffer::isDepClean(string const & name) const { - DepClean::const_iterator it = pimpl_->dep_clean.find(name); + DepClean::const_iterator const it = pimpl_->dep_clean.find(name); if (it == pimpl_->dep_clean.end()) return true; return it->second; @@ -1302,19 +1316,24 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result) void Buffer::changeLanguage(Language const * from, Language const * to) { + BOOST_ASSERT(from); + BOOST_ASSERT(to); + lyxerr << "Changing Language!" << endl; // Take care of l10n/i18n updateDocLang(to); - ParIterator end = par_iterator_end(); - for (ParIterator it = par_iterator_begin(); it != end; ++it) - it->changeLanguage(params(), from, to); + for_each(par_iterator_begin(), + par_iterator_end(), + bind(&Paragraph::changeLanguage, _1, params(), from, to)); } void Buffer::updateDocLang(Language const * nlang) { + BOOST_ASSERT(nlang); + pimpl_->messages.reset(new Messages(nlang->code())); } @@ -1330,10 +1349,10 @@ bool Buffer::isMultiLingual() const } -ParIterator Buffer::getParFromID(int id) const +ParIterator Buffer::getParFromID(int const id) const { ParConstIterator it = par_iterator_begin(); - ParConstIterator end = par_iterator_end(); + ParConstIterator const end = par_iterator_end(); if (id < 0) { // John says this is called with id == -1 from undo @@ -1349,22 +1368,10 @@ ParIterator Buffer::getParFromID(int id) const } -bool Buffer::hasParWithID(int id) const +bool Buffer::hasParWithID(int const id) const { - ParConstIterator it = par_iterator_begin(); - ParConstIterator end = par_iterator_end(); - - if (id < 0) { - // John says this is called with id == -1 from undo - lyxerr << "hasParWithID(), id: " << id << endl; - return 0; - } - - for (; it != end; ++it) - if (it->id() == id) - return true; - - return false; + ParConstIterator const it = getParFromID(id); + return it != par_iterator_end(); } @@ -1450,6 +1457,7 @@ bool Buffer::isUnnamed() const } +#warning this function should be moved to buffer_pimpl.C void Buffer::markDirty() { if (pimpl_->lyx_clean) {