Not much needed except this and two boost changes
--
Those who desire to give up Freedom in order to gain Security, will not have,
nor do they deserve, either one. (T. Jefferson or B. Franklin or both...)
Index: Chktex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Chktex.C,v
retrieving revision 1.23
diff -u -p -r1.23 Chktex.C
--- Chktex.C 30 Mar 2003 20:25:36 -0000 1.23
+++ Chktex.C 30 Jun 2003 11:36:22 -0000
@@ -66,7 +66,7 @@ int Chktex::scanLogFile(TeXErrors & terr
string const tmp = OnlyFilename(ChangeExtension(file, ".log"));
#if USE_BOOST_FORMAT
- boost::format msg(_("ChkTeX warning id # %1$d"));
+ boost::format msg(STRCONV(_("ChkTeX warning id # %1$d")));
#else
string const msg(_("ChkTeX warning id # "));
#endif
@@ -87,7 +87,7 @@ int Chktex::scanLogFile(TeXErrors & terr
#if USE_BOOST_FORMAT
msg % warno;
- terr.insertError(lineno, msg.str(), warning);
+ terr.insertError(lineno, STRCONV(msg.str()), warning);
msg.clear();
#else
terr.insertError(lineno, msg + warno, warning);
Index: funcrequest.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/funcrequest.C,v
retrieving revision 1.7
diff -u -p -r1.7 funcrequest.C
--- funcrequest.C 4 Mar 2003 09:27:27 -0000 1.7
+++ funcrequest.C 30 Jun 2003 11:36:22 -0000
@@ -107,7 +107,7 @@ void FuncRequest::errorMessage(string co
void split(vector<string> & args, string str)
{
- istringstream is(str);
+ istringstream is(STRCONV(str));
while (is) {
char c;
string s;
Index: frontends/controllers/tex_helpers.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/tex_helpers.C,v
retrieving revision 1.11
diff -u -p -r1.11 tex_helpers.C
--- frontends/controllers/tex_helpers.C 20 Jun 2003 14:03:48 -0000 1.11
+++ frontends/controllers/tex_helpers.C 30 Jun 2003 11:36:22 -0000
@@ -71,7 +71,7 @@ void getTexFileList(string const & filen
std::vector<string>::iterator it = list.begin();
std::vector<string>::iterator end = list.end();
for (; it != end; ++it) {
- *it = regex.Merge(*it, "/");
+ *it = STRCONV(regex.Merge(it->c_str(), "/"));
}
lyx::eliminate_duplicates(list);
@@ -84,14 +84,14 @@ string const getListOfOptions(string con
string optionList = string();
std::ifstream is(filename.c_str());
while (is) {
- string s;
- is >> s;
- if (contains(s,"DeclareOption")) {
- s = s.substr(s.find("DeclareOption"));
- s = split(s,'{'); // cut front
- s = token(s,'}',0); // cut end
- optionList += (s + '\n');
- }
+ string s;
+ is >> s;
+ if (contains(s,"DeclareOption")) {
+ s = s.substr(s.find("DeclareOption"));
+ s = split(s,'{'); // cut front
+ s = token(s,'}',0); // cut end
+ optionList += (s + '\n');
+ }
}
return optionList;
}
Index: insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.729
diff -u -p -r1.729 ChangeLog
--- insets/ChangeLog 28 Jun 2003 01:23:10 -0000 1.729
+++ insets/ChangeLog 30 Jun 2003 11:36:23 -0000
@@ -1,3 +1,10 @@
+
+2003-06-30 André Pönitz <[EMAIL PROTECTED]>
+
+ * insetcite.C (localDispatch): fix case of missing return value
+
+ * insetcite.C (ascii): remove unneeded temporary
+
2003-06-28 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* insetspace.h: fix \file
Index: support/filetools.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/filetools.C,v
retrieving revision 1.157
diff -u -p -r1.157 filetools.C
--- support/filetools.C 28 Jun 2003 01:23:11 -0000 1.157
+++ support/filetools.C 30 Jun 2003 11:36:23 -0000
@@ -692,7 +692,7 @@ string const NormalizePath(string const
// Normalise paths like /foo//bar ==> /foo/bar
boost::RegEx regex("/{2,}");
- RTemp = regex.Merge(RTemp, "/");
+ RTemp = STRCONV(regex.Merge(STRCONV(RTemp), "/"));
while (!RTemp.empty()) {
// Split by next /
Index: support/lstrings.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/lstrings.C,v
retrieving revision 1.69
diff -u -p -r1.69 lstrings.C
--- support/lstrings.C 22 May 2003 10:47:31 -0000 1.69
+++ support/lstrings.C 30 Jun 2003 11:36:23 -0000
@@ -613,29 +613,39 @@ string const getStringFromVector(vector<
string bformat(string const & fmt, string const & arg1)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1)).str());
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)).str());
}
string bformat(string const & fmt, string const & arg1, string const & arg2)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)).str());
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+ % STRCONV(arg2)).str());
}
string bformat(string const & fmt, string const & arg1, string const & arg2,
string const & arg3)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)
- % STRCONV(arg3)).str());
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+ % STRCONV(arg2) % STRCONV(arg3)).str());
}
string bformat(string const & fmt, string const & arg1, string const & arg2,
string const & arg3, string const & arg4)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)
- % STRCONV(arg3) % STRCONV(arg4)).str());
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+ % STRCONV(arg2) % STRCONV(arg3) % STRCONV(arg4)).str());
+}
+
+
+string bformat(string const & fmt, string const & arg1, string const & arg2,
+ string const & arg3, string const & arg4, string const & arg5)
+{
+ return STRCONV((boost::format(STRCONV(fmt)) % STRCONV(arg1)
+ % STRCONV(arg2) % STRCONV(arg3) % STRCONV(arg4)
+ % STRCONV(arg5)).str());
}
#else
@@ -682,6 +692,23 @@ string bformat(string const & fmt, strin
str = subst(str, "%2$s", arg2);
str = subst(str, "%3$s", arg3);
str = subst(str, "%4$s", arg4);
+ return subst(str, "%%", "%");
+}
+
+
+string bformat(string const & fmt, string const & arg1, string const & arg2,
+ string const & arg3, string const & arg4, string const & arg5)
+{
+ lyx::Assert(contains(fmt, "%1$s"));
+ lyx::Assert(contains(fmt, "%2$s"));
+ lyx::Assert(contains(fmt, "%3$s"));
+ lyx::Assert(contains(fmt, "%4$s"));
+ lyx::Assert(contains(fmt, "%5$s"));
+ string str = subst(fmt, "%1$s", arg1);
+ str = subst(str, "%2$s", arg2);
+ str = subst(str, "%3$s", arg3);
+ str = subst(str, "%4$s", arg4);
+ str = subst(str, "%5$s", arg5);
return subst(str, "%%", "%");
}
