bool isValidLaTeXFileName(string const & filename)
{
- string const invalid_chars("#$%{}[]\"^");
+ string const invalid_chars("#%\"");
+ return filename.find_first_of(invalid_chars) == string::npos;
+}
+
+
+bool isValidDVIFileName(string const & filename)
+{
+ string const invalid_chars("${}()[]^");
return filename.find_first_of(invalid_chars) == string::npos;
}
each po file is able to tell us its name. (JMarc)
*/
- string lang = to_ascii(_("[[Replace with the code of your language]]"));
+ string lang = to_ascii(_(languageTestString()));
string const language = getEnv("LANGUAGE");
if (!lang.empty() && !language.empty())
lang = language;
static string const envvar_br = "[$]\\{([A-Za-z_][A-Za-z_0-9]*)\\}";
// $VAR is defined as:
- // $\{[A-Za-z_][A-Za-z_0-9]*\}
+ // $[A-Za-z_][A-Za-z_0-9]*
static string const envvar = "[$]([A-Za-z_][A-Za-z_0-9]*)";
static regex envvar_br_re("(.*)" + envvar_br + "(.*)");
static regex envvar_re("(.*)" + envvar + "(.*)");
- smatch what;
- string result;
- string remaining = path;
+ string result = path;
while (1) {
- regex_match(remaining, what, envvar_br_re);
- if (!what[0].matched) {
- regex_match(remaining, what, envvar_re);
- if (!what[0].matched) {
- result += remaining;
+ smatch what;
+ if (!regex_match(result, what, envvar_br_re)) {
+ if (!regex_match(result, what, envvar_re))
break;
- }
}
string env_var = getEnv(what.str(2));
- if (!env_var.empty())
- result += what.str(1) + env_var;
- else
- result += what.str(1) + "$" + what.str(2);
- remaining = what.str(3);
+ result = what.str(1) + env_var + what.str(3);
}
return result;
}
#error No popen() function.
#endif
- // (Claus Hentschel) Check if popen was succesful ;-)
+ // (Claus Hentschel) Check if popen was successful ;-)
if (!inf) {
lyxerr << "RunCommand:: could not start child process" << endl;
return make_pair(-1, string());
}
+bool prefs2prefs(FileName const & filename, FileName const & tempfile, bool lfuns)
+{
+ FileName const script = libFileSearch("scripts", "prefs2prefs.py");
+ if (script.empty()) {
+ LYXERR0("Could not find bind file conversion "
+ "script prefs2prefs.py.");
+ return false;
+ }
+
+ ostringstream command;
+ command << os::python() << ' ' << quoteName(script.toFilesystemEncoding())
+ << ' ' << (lfuns ? "-l" : "-p") << ' '
+ << quoteName(filename.toFilesystemEncoding())
+ << ' ' << quoteName(tempfile.toFilesystemEncoding());
+ string const command_str = command.str();
+
+ LYXERR(Debug::FILES, "Running `" << command_str << '\'');
+
+ cmd_ret const ret = runCommand(command_str);
+ if (ret.first != 0) {
+ LYXERR0("Could not run file conversion script prefs2prefs.py.");
+ return false;
+ }
+ return true;
+}
+
+
} //namespace support
} // namespace lyx