#include "Floating.h"
#include "FloatList.h"
#include "gettext.h"
+#include "InsetList.h"
#include "InsetIterator.h"
#include "Language.h"
#include "LaTeX.h"
+#include "Layout.h"
+#include "LayoutPtr.h"
#include "LyX.h"
#include "TextClass.h"
+#include "TextClassList.h"
#include "Paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphList.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
-#include "LyXVC.h"
#include "TexRow.h"
#include "Text.h"
#include "TocBackend.h"
-#include "VCBackend.h"
#include "frontends/alert.h"
#include "insets/InsetBibitem.h"
-#include "insets/InsetCaption.h"
#include "insets/InsetInclude.h"
-#include "insets/InsetTabular.h"
-#include "support/convert.h"
#include "support/filetools.h"
#include "support/fs_extras.h"
#include "support/lyxlib.h"
#include <boost/bind.hpp>
-#include <boost/filesystem/operations.hpp>
using std::min;
using std::string;
using support::unlink;
namespace Alert = frontend::Alert;
-namespace fs = boost::filesystem;
-
-namespace {
-
-bool readFile(Buffer * const b, FileName const & s)
-{
- BOOST_ASSERT(b);
-
- // File information about normal file
- if (!fs::exists(s.toFilesystemEncoding())) {
- docstring const file = makeDisplayPath(s.absFilename(), 50);
- docstring text = bformat(_("The specified document\n%1$s"
- "\ncould not be read."), file);
- Alert::error(_("Could not read document"), text);
- return false;
- }
-
- // Check if emergency save file exists and is newer.
- FileName const e(s.absFilename() + ".emergency");
-
- if (fs::exists(e.toFilesystemEncoding()) &&
- fs::exists(s.toFilesystemEncoding()) &&
- fs::last_write_time(e.toFilesystemEncoding()) > fs::last_write_time(s.toFilesystemEncoding()))
- {
- docstring const file = makeDisplayPath(s.absFilename(), 20);
- docstring const text =
- bformat(_("An emergency save of the document "
- "%1$s exists.\n\n"
- "Recover emergency save?"), file);
- switch (Alert::prompt(_("Load emergency save?"), text, 0, 2,
- _("&Recover"), _("&Load Original"),
- _("&Cancel")))
- {
- case 0:
- // the file is not saved if we load the emergency file.
- b->markDirty();
- return b->readFile(e);
- case 1:
- break;
- default:
- return false;
- }
- }
-
- // Now check if autosave file is newer.
- FileName const a(onlyPath(s.absFilename()) + '#' + onlyFilename(s.absFilename()) + '#');
-
- if (fs::exists(a.toFilesystemEncoding()) &&
- fs::exists(s.toFilesystemEncoding()) &&
- fs::last_write_time(a.toFilesystemEncoding()) > fs::last_write_time(s.toFilesystemEncoding()))
- {
- docstring const file = makeDisplayPath(s.absFilename(), 20);
- docstring const text =
- bformat(_("The backup of the document "
- "%1$s is newer.\n\nLoad the "
- "backup instead?"), file);
- switch (Alert::prompt(_("Load backup?"), text, 0, 2,
- _("&Load backup"), _("Load &original"),
- _("&Cancel") ))
- {
- case 0:
- // the file is not saved if we load the autosave file.
- b->markDirty();
- return b->readFile(a);
- case 1:
- // Here we delete the autosave
- unlink(a);
- break;
- default:
- return false;
- }
- }
- return b->readFile(s);
-}
-
-
-} // namespace anon
-
-
-
-bool loadLyXFile(Buffer * b, FileName const & s)
-{
- BOOST_ASSERT(b);
-
- if (fs::is_readable(s.toFilesystemEncoding())) {
- if (readFile(b, s)) {
- b->lyxvc().file_found_hook(s);
- if (!fs::is_writable(s.toFilesystemEncoding()))
- b->setReadonly(true);
- return true;
- }
- } else {
- docstring const file = makeDisplayPath(s.absFilename(), 20);
- // Here we probably should run
- if (LyXVC::file_not_found_hook(s)) {
- docstring const text =
- bformat(_("Do you want to retrieve the document"
- " %1$s from version control?"), file);
- int const ret = Alert::prompt(_("Retrieve from version control?"),
- text, 0, 1, _("&Retrieve"), _("&Cancel"));
-
- if (ret == 0) {
- // How can we know _how_ to do the checkout?
- // With the current VC support it has to be,
- // a RCS file since CVS do not have special ,v files.
- RCS::retrieve(s);
- return loadLyXFile(b, s);
- }
- }
- }
- return false;
-}
-
-
-bool checkIfLoaded(FileName const & fn)
-{
- return theBufferList().getBuffer(fn.absFilename());
-}
Buffer * checkAndLoadLyXFile(FileName const & filename)
if (theBufferList().close(checkBuffer, false))
// Load it again.
return checkAndLoadLyXFile(filename);
- else
- // The file could not be closed.
- return 0;
+ // The file could not be closed.
+ return 0;
}
- if (isFileReadable(filename)) {
+ if (filename.isReadable()) {
Buffer * b = theBufferList().newBuffer(filename.absFilename());
- if (!lyx::loadLyXFile(b, filename)) {
+ if (!b->loadLyXFile(filename)) {
theBufferList().release(b);
return 0;
}
return 0;
}
+
// FIXME newFile() should probably be a member method of Application...
Buffer * newFile(string const & filename, string const & templatename,
bool const isNamed)
}
b->setReadonly(false);
- b->fully_loaded(true);
+ b->setFullyLoaded(true);
return b;
}
-void bufferErrors(Buffer const & buf, TeXErrors const & terr,
- ErrorList & errorList)
-{
- TeXErrors::Errors::const_iterator cit = terr.begin();
- TeXErrors::Errors::const_iterator end = terr.end();
-
- for (; cit != end; ++cit) {
- int id_start = -1;
- int pos_start = -1;
- int errorrow = cit->error_in_line;
- bool found = buf.texrow().getIdFromRow(errorrow, id_start,
- pos_start);
- int id_end = -1;
- int pos_end = -1;
- do {
- ++errorrow;
- found = buf.texrow().getIdFromRow(errorrow, id_end,
- pos_end);
- } while (found && id_start == id_end && pos_start == pos_end);
-
- errorList.push_back(ErrorItem(cit->error_desc,
- cit->error_text, id_start, pos_start, pos_end));
- }
-}
-
-
-string const bufferFormat(Buffer const & buffer)
-{
- if (buffer.isDocBook())
- return "docbook";
- else if (buffer.isLiterate())
- return "literate";
- else
- return "latex";
-}
-
-
int countWords(DocIterator const & from, DocIterator const & to)
{
int count = 0;
depth_type getItemDepth(ParIterator const & it)
{
Paragraph const & par = *it;
- LYX_LABEL_TYPES const labeltype = par.layout()->labeltype;
+ LabelType const labeltype = par.layout()->labeltype;
if (labeltype != LABEL_ENUMERATE && labeltype != LABEL_ITEMIZE)
return 0;
{
TextClass const & textclass = buf.params().getTextClass();
Paragraph & par = it.paragraph();
- Layout_ptr const & layout = par.layout();
+ LayoutPtr const & layout = par.layout();
Counters & counters = textclass.counters();
if (par.params().startOfAppendix()) {
par.params().labelWidthString(docstring());
}
- // is it a layout that has an automatic label?
- if (layout->labeltype == LABEL_COUNTER) {
+ switch(layout->labeltype) {
+ case LABEL_COUNTER:
if (layout->toclevel <= buf.params().secnumdepth
&& (layout->latextype != LATEX_ENVIRONMENT
|| isFirstInSequence(it.pit(), it.plist()))) {
par.expandLabel(layout, buf.params()));
} else
par.params().labelString(docstring());
+ break;
- } else if (layout->labeltype == LABEL_ITEMIZE) {
+ case LABEL_ITEMIZE: {
// At some point of time we should do something more
// clever here, like:
// par.params().labelString(
break;
}
par.params().labelString(itemlabel);
+ break;
+ }
- } else if (layout->labeltype == LABEL_ENUMERATE) {
- // FIXME
- // Yes I know this is a really, really! bad solution
+ case LABEL_ENUMERATE: {
+ // FIXME: Yes I know this is a really, really! bad solution
// (Lgb)
docstring enumcounter = from_ascii("enum");
par.params().labelString(counters.counterLabel(
par.translateIfPossible(from_ascii(format), buf.params())));
- } else if (layout->labeltype == LABEL_BIBLIO) {// ale970302
- counters.step(from_ascii("bibitem"));
- int number = counters.value(from_ascii("bibitem"));
- if (par.bibitem())
- par.bibitem()->setCounter(number);
+ break;
+ }
- par.params().labelString(
- par.translateIfPossible(layout->labelstring(), buf.params()));
- // In biblio shouldn't be following counters but...
- } else if (layout->labeltype == LABEL_SENSITIVE) {
+ case LABEL_SENSITIVE: {
string const & type = counters.current_float();
docstring full_label;
if (type.empty())
counters.step(from_utf8(type));
full_label = bformat(from_ascii("%1$s %2$s:"),
name,
- convert<docstring>(counters.value(from_utf8(type))));
+ counters.theCounter(from_utf8(type)));
} else
full_label = bformat(from_ascii("%1$s #:"), name);
}
par.params().labelString(full_label);
+ break;
+ }
- } else if (layout->labeltype == LABEL_NO_LABEL)
+ case LABEL_NO_LABEL:
par.params().labelString(docstring());
- else
+ break;
+
+ case LABEL_MANUAL:
+ case LABEL_TOP_ENVIRONMENT:
+ case LABEL_CENTERED_TOP_ENVIRONMENT:
+ case LABEL_STATIC:
+ case LABEL_BIBLIO:
par.params().labelString(
- par.translateIfPossible(layout->labelstring(), buf.params()));
+ par.translateIfPossible(layout->labelstring(),
+ buf.params()));
+ break;
+ }
}
} // anon namespace
setLabel(buf, parit);
// Now the insets
- InsetList::const_iterator iit = parit->insetlist.begin();
- InsetList::const_iterator end = parit->insetlist.end();
+ InsetList::const_iterator iit = parit->insetList().begin();
+ InsetList::const_iterator end = parit->insetList().end();
for (; iit != end; ++iit) {
parit.pos() = iit->pos;
iit->inset->updateLabels(buf, parit);
// the contents of the paragraphs.
void updateLabels(Buffer const & buf, bool childonly)
{
- Buffer const * const master = buf.getMasterBuffer();
+ Buffer const * const master = buf.masterBuffer();
// Use the master text class also for child documents
TextClass const & textclass = master->params().getTextClass();
void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
{
if (par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
- Buffer * master = buffer.getMasterBuffer();
+ Buffer * master = buffer.masterBuffer();
master->tocBackend().updateItem(par_it);
master->structureChanged();
}
}
-void loadChildDocuments(Buffer const & buf)
-{
- bool parse_error = false;
-
- for (InsetIterator it = inset_iterator_begin(buf.inset()); it; ++it) {
- if (it->lyxCode() != Inset::INCLUDE_CODE)
- continue;
- InsetInclude const & inset = static_cast<InsetInclude const &>(*it);
- InsetCommandParams const & ip = inset.params();
- Buffer * child = loadIfNeeded(buf, ip);
- if (!child)
- continue;
- parse_error |= !child->errorList("Parse").empty();
- loadChildDocuments(*child);
- }
-
- if (use_gui && buf.getMasterBuffer() == &buf)
- updateLabels(buf);
-}
-
} // namespace lyx
projects / lyx.git / blobdiff