From d7dbc63467b8ddc07aaca9fa3c73b2b2325a9c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Tue, 12 Oct 1999 19:21:31 +0000 Subject: [PATCH] some no-op changes, planning a new branch to update the LaTeX files. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@187 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 7 +++++++ src/LaTeX.C | 13 ++++--------- src/LaTeX.h | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2a15acf3a..d7a0c93735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1999-10-12 Lars Gullik Bjønnes + + * src/LaTeX.C: some no-op changes moved declaration of some + variables around. + + * src/LaTeX.h (LATEX_H): changed include guard name + 1999-10-12 Jean-Marc Lasgouttes * lib/reLyX/Makefile.am: install noweb2lyx. diff --git a/src/LaTeX.C b/src/LaTeX.C index f21dfc91cf..a4999fa270 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -132,7 +132,7 @@ void TeXErrors::scanError(LyXLex &lex) // msg. if (contains(errstr, "l.")) { // We make a const copy to make [] fast. (Asger) - string const es = errstr; + string const es(errstr); for (string::size_type i = 2; i < es.length(); ++i) { if (es[i-2] == 'l' && es[i-1] == '.' && (es[i] >= '0' && es[i]<= '9')) { @@ -198,9 +198,6 @@ void TeXErrors::printErrors() << tmperr->error_in_line << ": " << tmperr->error_desc << '\n' << tmperr->error_text << endl; - //%d: %s\n%s\n", tmperr->error_in_line, - // tmperr->error_desc.c_str(), - // tmperr->error_text.c_str()); tmperr = tmperr->next_error; } while (tmperr); } @@ -483,20 +480,18 @@ bool LaTeX::runBibTeX(string const &file) int LaTeX::scanLogFile(TeXErrors &terr) { - string token; int retval = NO_ERRORS; - - LyXLex lex(0, 0); - string tmp = ChangeExtension(file, ".log", true); + LyXLex lex(0, 0); if (!lex.setFile(tmp)) { // unable to open file // return at once retval |= NO_LOGFILE; return retval; } - + + string token; while (lex.IsOK()) { if (lex.EatLine()) token = lex.GetString(); diff --git a/src/LaTeX.h b/src/LaTeX.h index e32d3c7f4e..99e3a56e26 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -12,8 +12,8 @@ *====================================================== */ -#ifndef _LATEX_H -#define _LATEX_H +#ifndef LATEX_H +#define LATEX_H #ifdef __GNUG__ #pragma interface