update no.po

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 7e1e9860af415c68e796ac9f5b12c2506147112a..797b316b56b214f90b141ecb75e9abfcce09fb3d 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -203,7 +203,11 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
        lyxerr[Debug::LATEX] << "Run #" << count << endl;
        if (lfun) {
                ostringstream str;
+#if USE_BOOST_FORMAT
                str << boost::format(_("LaTeX run number %1$d")) % count;
+#else
+               str << _("LaTeX run number ") << count;
+#endif
                lfun->dispatch(FuncRequest(LFUN_MESSAGE, STRCONV(str.str())));
        }
 
@@ -288,7 +292,11 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                        << "Run #" << count << endl;
                if (lfun) {
                        ostringstream str;
+#if USE_BOOST_FORMAT
                        str << boost::format(_("LaTeX run number %1$d")) % count;
+#else
+                       str << _("LaTeX run number ") << count;
+#endif
                        // check lyxstring string stream and gcc 3.1 before fixing
                        lfun->dispatch(FuncRequest(LFUN_MESSAGE, STRCONV(str.str())));
                }
@@ -345,7 +353,11 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                lyxerr[Debug::LATEX] << "Run #" << count << endl;
                if (lfun) {
                        ostringstream str;
+#if USE_BOOST_FORMAT
                        str << boost::format(_("LaTeX run number %1$d")) % count;
+#else
+                       str << _("LaTeX run number ") << count;
+#endif
                        lfun->dispatch(FuncRequest(LFUN_MESSAGE, STRCONV(str.str())));
                }
 
@@ -405,7 +417,7 @@ LaTeX::scanAuxFiles(string const & file)
        result.push_back(scanAuxFile(file));
 
        for (int i = 1; i < 1000; ++i) {
-               string file2 = ChangeExtension(file, "") + "." + tostr(i)
+               string file2 = ChangeExtension(file, "") + '.' + tostr(i)
                        + ".aux";
                FileInfo fi(file2);
                if (!fi.exist())
@@ -460,8 +472,8 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
                                string database;
                                data = split(data, database, ',');
                                database = ChangeExtension(database, "bib");
-                               lyxerr[Debug::LATEX] << "Bibtex database: `"
-                                                    << database << "'" << endl;
+                               lyxerr[Debug::LATEX] << "BibTeX database: `"
+                                                    << database << '\'' << endl;
                                aux_info.databases.insert(database);
                        }
                } else if (regex_match(STRCONV(token), sub, reg3)) {
@@ -469,8 +481,8 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
                        // token is now the style file
                        // pass it to the helper
                        style = ChangeExtension(style, "bst");
-                       lyxerr[Debug::LATEX] << "Bibtex style: `"
-                                            << style << "'" << endl;
+                       lyxerr[Debug::LATEX] << "BibTeX style: `"
+                                            << style << '\'' << endl;
                        aux_info.styles.insert(style);
                } else if (regex_match(STRCONV(token), sub, reg4)) {
                        string const file2 = STRCONV(sub.str(1));
@@ -577,7 +589,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                        << "We should rerun." << endl;
                                retval |= RERUN;
                        }
-               } else if (prefixIs(token, "(")) {
+               } else if (token[0] == '(') {
                        if (contains(token, "Rerun LaTeX") ||
                            contains(token, "Rerun to get")) {
                                // Used by natbib