anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some ws and more boost.format

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5707 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-11-25 01:15:10 +00:00
parent af4fca532f
commit efd7b3eaa4
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,5 +1,10 @@
2002-11-25 Lars Gullik Bjønnes <larsbj@gullik.net> 2002-11-25 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyx_cb.C (start): boost.formatify
do not include <iostream>
* lengthcommon.C: ws only
* boost-inst.C,BoostFormat.h: add more explict instantations * boost-inst.C,BoostFormat.h: add more explict instantations
2002-11-24 Lars Gullik Bjønnes <larsbj@gullik.net> 2002-11-24 Lars Gullik Bjønnes <larsbj@gullik.net>

35
src/lengthcommon.C
View File

@ -10,40 +10,40 @@ int const num_units = LyXLength::UNIT_NONE;
// I am not sure if "mu" should be possible to select (Lgb) // I am not sure if "mu" should be possible to select (Lgb)
// unit_name is for compatibility. Can be deleted when all works well. // unit_name is for compatibility. Can be deleted when all works well.
// means, when we have full language support for the lengths // means, when we have full language support for the lengths
// in all gui's (Herbert 2002-11-01) // in all gui's (Herbert 2002-11-01)
char const * unit_name[num_units] = { char const * unit_name[num_units] = {
"sp", "pt", "bp", "dd", "mm", "pc", "sp", "pt", "bp", "dd", "mm", "pc",
"cc", "cm", "in", "ex", "em", "mu", "cc", "cm", "in", "ex", "em", "mu",
"text%", "col%", "page%", "line%", "text%", "col%", "page%", "line%",
"theight%", "pheight%" }; "theight%", "pheight%" };
// the latex units // the latex units
char const * unit_name_ltx[num_units] = { char const * unit_name_ltx[num_units] = {
"sp", "pt", "bp", "dd", "mm", "pc", "sp", "pt", "bp", "dd", "mm", "pc",
"cc", "cm", "in", "ex", "em", "mu", "cc", "cm", "in", "ex", "em", "mu",
// in 1.4 the following names should be used. then no // in 1.4 the following names should be used. then no
// translation into the latex ones are needed // translation into the latex ones are needed
// "textheight", "columnwidth", "pagewidth", "linewidth", // "textheight", "columnwidth", "pagewidth", "linewidth",
// "textheight", "pageheight" }; // "textheight", "pageheight" };
"text%", "col%", "page%", "line%", "text%", "col%", "page%", "line%",
"theight%", "pheight%" }; "theight%", "pheight%" };
// the LyX gui units // the LyX gui units
char const * unit_name_gui[num_units] = { char const * unit_name_gui[num_units] = {
N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"), N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
N_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"), N_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
N_("text%"), N_("col%"), N_("page%"), N_("line%"), N_("text%"), N_("col%"), N_("page%"), N_("line%"),
N_("theight%"), N_("pheight%") }; N_("theight%"), N_("pheight%") };
// this one maybe better ???? but there can be problems with // this one maybe better ???? but there can be problems with
// xforms (Herbert) // xforms (Herbert)
// N_("textwidth%"), N_("columnwidth%"), N_("pagewidth%"), N_("linewidth%"), // N_("textwidth%"), N_("columnwidth%"), N_("pagewidth%"), N_("linewidth%"),
// N_("textheight%"), N_("pageheight%") }; // N_("textheight%"), N_("pageheight%") };
// or altenative this ones // or altenative this ones
// N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"), // N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"),
// N_("theight%"), N_("pheight%") }; // N_("theight%"), N_("pheight%") };
LyXLength::UNIT unitFromString(string const & data) LyXLength::UNIT unitFromString(string const & data)
{ {
@ -52,4 +52,3 @@ LyXLength::UNIT unitFromString(string const & data)
++i; ++i;
return static_cast<LyXLength::UNIT>(i); return static_cast<LyXLength::UNIT>(i);
} }

14
src/lyx_cb.C
View File

@ -36,10 +36,11 @@
#include "support/systemcall.h" #include "support/systemcall.h"
#include "support/lstrings.h" #include "support/lstrings.h"
#include "BoostFormat.h"
#include <fstream> #include <fstream>
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
#include <iostream>
using std::vector; using std::vector;
using std::ifstream; using std::ifstream;
@ -268,8 +269,11 @@ private:
int AutoSaveBuffer::start() int AutoSaveBuffer::start()
{ {
command_ = _("Auto-saving $$f"); #if USE_BOOST_FORMAT
command_ = subst(command_, "$$f", fname_); command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_);
#else
command_ = _("Auto-saving ") + fname_;
#endif
return runNonBlocking(); return runNonBlocking();
} }
@ -317,7 +321,7 @@ int AutoSaveBuffer::generateChild()
} }
return pid; return pid;
} }
} // namespace anon } // namespace anon
@ -344,7 +348,7 @@ void AutoSave(BufferView * bv)
AutoSaveBuffer autosave(*bv, fname); AutoSaveBuffer autosave(*bv, fname);
autosave.start(); autosave.start();
bv->buffer()->markBakClean(); bv->buffer()->markBakClean();
bv->owner()->resetAutosaveTimer(); bv->owner()->resetAutosaveTimer();
} }