X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChktex.C;h=1e7f62d2bc7724506ecaa9f364aff8fd13fcd51a;hb=dad1fc66e44a4dad94eb1e9ffd5736bf8f59ae6d;hp=ac08ba8879172a190d4f1fdf97bc7b5747f7e03d;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git diff --git a/src/Chktex.C b/src/Chktex.C index ac08ba8879..1e7f62d2bc 100644 --- a/src/Chktex.C +++ b/src/Chktex.C @@ -13,10 +13,6 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "Chktex.h" #include "LaTeX.h" // TeXErrors #include "lyxlex.h" @@ -29,6 +25,8 @@ #include "support/path.h" #include "support/lstrings.h" +#include "BoostFormat.h" + #include using std::ifstream; @@ -65,8 +63,13 @@ int Chktex::scanLogFile(TeXErrors & terr) string token; int retval = 0; - string tmp = OnlyFilename(ChangeExtension(file, ".log")); + string const tmp = OnlyFilename(ChangeExtension(file, ".log")); +#if USE_BOOST_FORMAT + boost::format msg(_("ChkTeX warning id # %1$d")); +#else + string const msg(_("ChkTeX warning id # ")); +#endif ifstream ifs(tmp.c_str()); while (getline(ifs, token)) { string srcfile; @@ -80,9 +83,16 @@ int Chktex::scanLogFile(TeXErrors & terr) token = split(token, warno, ':'); token = split(token, warning, ':'); - int lineno = lyx::atoi(line); - warno = _("ChkTeX warning id #") + warno; - terr.insertError(lineno, warno, warning); + int const lineno = lyx::atoi(line); + +#if USE_BOOST_FORMAT + msg % warno; + terr.insertError(lineno, msg.str(), warning); + msg.clear(); +#else + terr.insertError(lineno, msg + warno, warning); +#endif + ++retval; } return retval;