anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial changes for all-in-one compilation

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17494 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-03-20 21:53:01 +00:00
parent e8c2962ecc
commit ace2418598
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/format.C
View File

@ -53,9 +53,9 @@ namespace os = support::os;
namespace {
string const token_from("$$i");
string const token_path("$$p");
string const token_socket("$$a");
string const token_from_format("$$i");
string const token_path_format("$$p");
string const token_socket_format("$$a");
class FormatNamesEqual : public std::unary_function<Format, bool> {
@ -309,12 +309,12 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
command += 'r';
}
if (!contains(command, token_from))
command += ' ' + token_from;
if (!contains(command, token_from_format))
command += ' ' + token_from_format;
command = subst(command, token_from, quoteName(filename.toFilesystemEncoding()));
command = subst(command, token_path, quoteName(onlyPath(filename.toFilesystemEncoding())));
command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
command = subst(command, token_socket_format, quoteName(theLyXServerSocket().address()));
lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
// FIXME UNICODE utf8 can be wrong for files
buffer.message(_("Executing command: ") + from_utf8(command));
@ -368,12 +368,12 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
string command = format->editor();
if (!contains(command, token_from))
command += ' ' + token_from;
if (!contains(command, token_from_format))
command += ' ' + token_from_format;
command = subst(command, token_from, quoteName(filename.toFilesystemEncoding()));
command = subst(command, token_path, quoteName(onlyPath(filename.toFilesystemEncoding())));
command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
command = subst(command, token_socket_format, quoteName(theLyXServerSocket().address()));
lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
// FIXME UNICODE utf8 can be wrong for files
buffer.message(_("Executing command: ") + from_utf8(command));

4
src/graphics/PreviewLoader.C
View File

@ -268,11 +268,11 @@ private:
double font_scaling_factor_;
/// We don't own this
static Converter const * pconverter_;
static lyx::Converter const * pconverter_;
};
Converter const * PreviewLoader::Impl::pconverter_;
lyx::Converter const * PreviewLoader::Impl::pconverter_;
//

7
src/support/docstream.C
View File

@ -18,6 +18,13 @@
#include <iconv.h>
#include <locale>
#ifdef min
#undef min
#endif
#ifdef max
#undef max
#endif
using lyx::ucs4_codeset;

2
src/support/lstrings.C
View File

@ -753,7 +753,7 @@ getVectorFromStringT(String const & str, String const & delim)
if (str.empty())
return vec;
String keys = rtrim(str);
for(;;) {
for(; ;) {
typename String::size_type const idx = keys.find(delim);
if (idx == String::npos) {
vec.push_back(ltrim(keys));