"Inter-word Space"

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index ac98e2fcb5989dba3de0d433850fdaa759e1b3db..56caaafc3e0d4b80239c5d921a74f7bd4fa49121 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -21,6 +21,7 @@
 #include "lyxtext.h"
 #include "gettext.h"
 #include "BufferView.h"
+#include "Lsstream.h"
 
 #include "insets/insetlabel.h"
 
@@ -36,8 +37,6 @@
 #include "support/systemcall.h"
 #include "support/lstrings.h"
 
-#include "support/BoostFormat.h"
-
 #include <fstream>
 #include <algorithm>
 #include <utility>
@@ -63,7 +62,7 @@ void ShowMessage(Buffer const * buf,
                 string const & msg2,
                 string const & msg3)
 {
-       if (lyxrc.use_gui
+       if (lyx_gui::use_gui
            && buf && buf->getUser() && buf->getUser()->owner()) {
                        string const str = msg1 + ' ' + msg2 + ' ' + msg3;
                        buf->getUser()->owner()->message(str);
@@ -87,16 +86,10 @@ bool MenuWrite(BufferView * bv, Buffer * buffer)
 
        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);
@@ -145,17 +138,10 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
        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;
@@ -182,7 +168,7 @@ void QuitLyX()
 {
        lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
 
-       if (lyxrc.use_gui) {
+       if (lyx_gui::use_gui) {
                if (!bufferlist.quitWriteAll())
                        return;
 
@@ -200,13 +186,8 @@ void QuitLyX()
        lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << 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
+               string msg = bformat(_("Could not remove the temporary directory %1$s"),
+                       system_tempdir);
                Alert::warning(_("Could not remove temporary directory"), msg);
        }
 
@@ -238,11 +219,7 @@ private:
 
 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();
 }
 
@@ -366,9 +343,6 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
        if (tmpstr.empty())
                return;
 
-       // insert the string
-       bv->hideCursor();
-
        // clear the selection
        bool flag = (bv->text == bv->getLyXText());
        if (flag)
@@ -407,16 +381,8 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
        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();
        }
@@ -425,16 +391,8 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
        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();
        }
@@ -462,15 +420,18 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 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;
                }
        }
@@ -484,7 +445,7 @@ string const getPossibleLabel(BufferView const & bv)
            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;