#include "lyx_cb.h"
#include "lyx_main.h"
#include "buffer.h"
+#include "buffer_funcs.h"
#include "bufferlist.h"
#include "bufferview_funcs.h"
#include "debug.h"
#include "lyxtext.h"
#include "gettext.h"
#include "BufferView.h"
+#include "Lsstream.h"
#include "insets/insetlabel.h"
#include "support/filetools.h"
#include "support/forkedcall.h"
#include "support/path.h"
+#include "support/path_defines.h"
#include "support/systemcall.h"
#include "support/lstrings.h"
-#include "BoostFormat.h"
-
#include <fstream>
#include <algorithm>
#include <utility>
+#include <cerrno>
+
+using namespace lyx::support;
using std::vector;
using std::ifstream;
bool quitting; // flag, that we are quitting the program
-void ShowMessage(Buffer const * buf,
- string const & msg1,
- string const & msg2,
- string const & msg3)
-{
- if (lyxrc.use_gui
- && buf && buf->getUser() && buf->getUser()->owner()) {
- string const str = msg1 + ' ' + msg2 + ' ' + msg3;
- buf->getUser()->owner()->message(str);
- } else
- lyxerr << msg1 << msg2 << msg3 << endl;
-}
-
-
//
// Menu callbacks
//
-bool MenuWrite(BufferView * bv, Buffer * buffer)
+bool MenuWrite(Buffer * buffer)
{
if (buffer->save()) {
lastfiles->newFile(buffer->fileName());
string const file = MakeDisplayPath(buffer->fileName(), 30);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The document %1$s could not be saved.\n\nDo you want to rename the document and try again?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The document ");
- text += file + _(" could not be saved.\n\nDo you want to rename the document and try again?");
-#endif
+ string text = bformat(_("The document %1$s could not be saved.\n\n"
+ "Do you want to rename the document and try again?"), file);
int const ret = Alert::prompt(_("Rename and save?"),
- text, 0, _("&Rename"), _("&Cancel"));
+ text, 0, 1, _("&Rename"), _("&Cancel"));
if (ret == 0)
- return WriteAs(bv, buffer);
+ return WriteAs(buffer);
return false;
}
-bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
+bool WriteAs(Buffer * buffer, string const & filename)
{
string fname = buffer->fileName();
string const oldname = fname;
FileInfo const myfile(fname);
if (myfile.isOK()) {
string const file = MakeDisplayPath(fname, 30);
-
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The document %1$s already exists.\n\nDo you want to over-write that document?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The document ");
- text += file + _(" already exists.\n\nDo you want to over-write that document?");
-#endif
+ string text = bformat(_("The document %1$s already exists.\n\n"
+ "Do you want to over-write that document?"), file);
int const ret = Alert::prompt(_("Over-write document?"),
- text, 1, _("&Over-write"), _("&Cancel"));
+ text, 0, 1, _("&Over-write"), _("&Cancel"));
if (ret == 1)
return false;
bool unnamed = buffer->isUnnamed();
buffer->setUnnamed(false);
- if (!MenuWrite(bv, buffer)) {
+ if (!MenuWrite(buffer)) {
buffer->setFileName(oldname);
buffer->setUnnamed(unnamed);
return false;
}
-int MenuRunChktex(Buffer * buffer)
-{
- int ret;
-
- if (buffer->isSGML()) {
- Alert::alert(_("Chktex does not work with SGML derived documents."));
- return 0;
- } else
- ret = buffer->runChktex();
-
- if (ret >= 0) {
- string s;
- string t;
- if (ret == 0) {
- s = _("No warnings found.");
- } else if (ret == 1) {
- s = _("One warning found.");
- t = _("Use `Navigate->Error' to find it.");
- } else {
- s += tostr(ret);
- s += _(" warnings found.");
- t = _("Use `Navigate->Error' to find them.");
- }
- Alert::alert(_("Chktex run successfully"), s, t);
- } else {
- Alert::alert(_("Error!"), _("It seems chktex does not work."));
- }
- return ret;
-}
-
-
void QuitLyX()
{
lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
- if (lyxrc.use_gui) {
+ if (lyx_gui::use_gui) {
if (!bufferlist.quitWriteAll())
return;
bufferlist.closeAll();
// do any other cleanup procedures now
- lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl;
+ lyxerr[Debug::INFO] << "Deleting tmp dir " << os::getTmpDir() << endl;
- if (destroyDir(system_tempdir) != 0) {
-#if USE_BOOST_FORMAT
- boost::format fmt = _("Could not remove the temporary directory %1$s");
- fmt % system_tempdir;
- string msg = fmt.str();
-#else
- string msg = _("Could not remove the temporary directory ") + system_tempdir;
-#endif
+ if (destroyDir(os::getTmpDir()) != 0) {
+ string msg = bformat(_("Could not remove the temporary directory %1$s"),
+ os::getTmpDir());
Alert::warning(_("Could not remove temporary directory"), msg);
}
int AutoSaveBuffer::start()
{
-#if USE_BOOST_FORMAT
- command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_);
-#else
- command_ = _("Auto-saving ") + fname_;
-#endif
+ command_ = bformat(_("Auto-saving %1$s"), fname_);
return runNonBlocking();
}
// anyway.
bool failed = false;
- string const tmp_ret = lyx::tempName(string(), "lyxauto");
+ string const tmp_ret = tempName(string(), "lyxauto");
if (!tmp_ret.empty()) {
bv_.buffer()->writeFile(tmp_ret);
// assume successful write of tmp_ret
- if (!lyx::rename(tmp_ret, fname_)) {
+ if (!rename(tmp_ret, fname_)) {
failed = true;
// most likely couldn't move between filesystems
// unless write of tmp_ret failed
// so remove tmp file (if it exists)
- lyx::unlink(tmp_ret);
+ unlink(tmp_ret);
}
} else {
failed = true;
// create new file with template
// SERVERCMD !
//
-Buffer * NewFile(string const & filename)
+void NewFile(BufferView * bv, string const & filename)
{
// Split argument by :
string name;
<< "\nName is " << name
<< "\nTemplate is " << tmpname << endl;
- // find a free buffer
- Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
- if (tmpbuf)
- lastfiles->newFile(tmpbuf->fileName());
- return tmpbuf;
+ bv->newFile(name, tmpname);
}
if (tmpstr.empty())
return;
- // insert the string
- bv->hideCursor();
-
// clear the selection
bool flag = (bv->text == bv->getLyXText());
if (flag)
if (!fi.readable()) {
string const error = strerror(errno);
string const file = MakeDisplayPath(fname, 50);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("Could not read the specified document\n%1$s\ndue to the error: %2$s"));
- fmt % file;
- fmt % error;
- string text = fmt.str();
-#else
- string text = _("Could not read the specified document\n");
- text += file + _(" due to the error: ");
- text += error;
-#endif
+ string const text = bformat(_("Could not read the specified document\n"
+ "%1$s\ndue to the error: %2$s"), file, error);
Alert::error(_("Could not read file"), text);
return string();
}
if (!ifs) {
string const error = strerror(errno);
string const file = MakeDisplayPath(fname, 50);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("Could not open the specified document\n%1$s\ndue to the error: %2$s"));
- fmt % file;
- fmt % error;
- string text = fmt.str();
-#else
- string text = _("Could not open the specified document\n");
- text += file + _(" due to the error: ");
- text += error;
-#endif
+ string const text = bformat(_("Could not open the specified document\n"
+ "%1$s\ndue to the error: %2$s"), file, error);
Alert::error(_("Could not open file"), text);
return string();
}
string const getPossibleLabel(BufferView const & bv)
{
- Paragraph * par = bv.getLyXText()->cursor.par();
- LyXLayout_ptr layout = par->layout();
- if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
- Paragraph * par2 = par->previous();
+ ParagraphList::iterator pit = bv.getLyXText()->cursor.par();
+ ParagraphList & plist = bv.getLyXText()->ownerParagraphs();
+
+ LyXLayout_ptr layout = pit->layout();
+
+ if (layout->latextype == LATEX_PARAGRAPH && pit != plist.begin()) {
+ ParagraphList::iterator pit2 = boost::prior(pit);
- LyXLayout_ptr const & layout2 = par2->layout();
+ LyXLayout_ptr const & layout2 = pit2->layout();
if (layout2->latextype != LATEX_PARAGRAPH) {
- par = par2;
+ pit = pit2;
layout = layout2;
}
}
lyxrc.label_init_length < 0)
text.erase();
- string par_text = par->asString(bv.buffer(), false);
+ string par_text = pit->asString(bv.buffer(), false);
for (int i = 0; i < lyxrc.label_init_length; ++i) {
if (par_text.empty())
break;
bv->owner()->message(_("Running configure..."));
// Run configure in user lyx directory
- Path p(user_lyxdir);
+ Path p(user_lyxdir());
Systemcall one;
one.startscript(Systemcall::Wait,
- AddName(system_lyxdir, "configure"));
+ AddName(system_lyxdir(), "configure"));
p.pop();
bv->owner()->message(_("Reloading configuration..."));
lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));