The following patch gets rid of some debug output. It also improves
some Counters error messages to be more useful (I saw these with
beamer.layout).
Lars, OK?
JMarc
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.2357
diff -u -p -r1.2357 ChangeLog
--- src/ChangeLog 18 Jan 2006 17:44:00 -0000 1.2357
+++ src/ChangeLog 19 Jan 2006 14:09:12 -0000
@@ -1,3 +1,10 @@
+2006-01-19 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * cursor.C (goUpDown): comment out some debug messages.
+
+ * counters.C (newCounter): make error messages more explicit
+ (these appear with some textclasses like beamer)
+
2006-01-18 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* kbmap.C (defkey):
Index: src/counters.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/counters.C,v
retrieving revision 1.36
diff -u -p -r1.36 counters.C
--- src/counters.C 9 Sep 2005 14:52:55 -0000 1.36
+++ src/counters.C 19 Jan 2006 14:09:12 -0000
@@ -81,7 +81,7 @@ void Counters::newCounter(string const &
CounterList::iterator const cit = counterList.find(newc);
// if already exist give warning and return
if (cit != counterList.end()) {
- lyxerr << "The new counter already exists." << endl;
+ lyxerr << "New counter already exists: " << newc << endl;
return;
}
counterList[newc];
@@ -94,14 +94,14 @@ void Counters::newCounter(string const &
CounterList::iterator const cit = counterList.find(newc);
// if already existant give warning and return
if (cit != counterList.end()) {
- lyxerr << "The new counter already exists." << endl;
+ lyxerr << "New counter already exists: " << newc << endl;
return;
}
// then check if masterc exists
CounterList::iterator const it = counterList.find(masterc);
// if not give warning and return
if (it == counterList.end()) {
- lyxerr << "The master counter does not exist." << endl;
+ lyxerr << "Master counter does not exist: " << masterc << endl;
return;
}
Index: src/cursor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/cursor.C,v
retrieving revision 1.141
diff -u -p -r1.141 cursor.C
--- src/cursor.C 11 Jan 2006 17:08:50 -0000 1.141
+++ src/cursor.C 19 Jan 2006 14:09:12 -0000
@@ -1019,10 +1019,10 @@ bool LCursor::goUpDown(bool up)
// try to find an inset that knows better then we
while (true) {
- lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
+ //lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
// ask inset first
if (inset().idxUpDown(*this, up)) {
- lyxerr << "idxUpDown triggered" << endl;
+ //lyxerr << "idxUpDown triggered" << endl;
// try to find best position within this inset
if (!selection())
setCursor(bruteFind2(*this, xo, yo));
@@ -1031,14 +1031,14 @@ bool LCursor::goUpDown(bool up)
// no such inset found, just take something "above"
if (!popLeft()) {
- lyxerr << "updown: popleft failed (strange case)" << endl;
+ //lyxerr << "updown: popleft failed (strange case)" << endl;
int ylow = up ? 0 : yo + 1;
int yhigh = up ? yo - 1 : bv().workHeight();
return bruteFind(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
}
// any improvement so far?
- lyxerr << "updown: popLeft succeeded" << endl;
+ //lyxerr << "updown: popLeft succeeded" << endl;
int xnew;
int ynew;
getPos(xnew, ynew);
Index: src/insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.494
diff -u -p -r1.494 insettabular.C
--- src/insets/insettabular.C 11 Jan 2006 14:22:09 -0000 1.494
+++ src/insets/insettabular.C 19 Jan 2006 14:09:13 -0000
@@ -421,7 +421,7 @@ string const InsetTabular::editMessage()
void InsetTabular::edit(LCursor & cur, bool left)
{
- lyxerr << "InsetTabular::edit: " << this << endl;
+ //lyxerr << "InsetTabular::edit: " << this << endl;
finishUndo();
cur.selection() = false;
cur.push(*this);
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.832
diff -u -p -r1.832 ChangeLog
--- src/frontends/qt2/ChangeLog 8 Jan 2006 10:57:31 -0000 1.832
+++ src/frontends/qt2/ChangeLog 19 Jan 2006 14:09:13 -0000
@@ -1,3 +1,8 @@
+2006-01-19 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * QLyXKeySym.C (initEncodings): make debug messages conditional on
+ KEY.
+
2006-01-08 Jürgen Spitzmüller <[EMAIL PROTECTED]>
* ui/QRefDialogBase.ui: re-connect the refsLB->Selected signal
Index: src/frontends/qt2/QLyXKeySym.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLyXKeySym.C,v
retrieving revision 1.35
diff -u -p -r1.35 QLyXKeySym.C
--- src/frontends/qt2/QLyXKeySym.C 17 Oct 2005 08:30:37 -0000 1.35
+++ src/frontends/qt2/QLyXKeySym.C 19 Jan 2006 14:09:13 -0000
@@ -90,7 +90,7 @@ void initEncodings()
if (s.find("UTF") != string::npos || s.find("utf") != string::npos)
//if (contains(c, "UTF") || contains(c, "utf"))
- lyxerr << "Warning: this system's locale uses Unicode." << endl;
+ lyxerr[Debug::KEY] << "Warning: this system's locale uses Unicode." << endl;
// strip off any encoding suffix
string::size_type i = s.find(".");
@@ -118,7 +118,7 @@ void initEncodings()
// when no document open
// use the appropriate encoding for the system language
- lyxerr << "Language code:" << s << endl;
+ lyxerr[Debug::KEY] << "Language code:" << s << endl;
for (Languages::const_iterator it=languages.begin(); it != languages.end(); ++it) {
//lyxerr << it->second.code() << ":" << it->second.encodingStr() << ":" << it->second.encoding() << endl;
if (it->second.code() == s) {
@@ -126,7 +126,7 @@ void initEncodings()
break;
}
}
- lyxerr << "Setting new locale for Qt:" << s << endl;
+ lyxerr[Debug::KEY] << "Setting new locale for Qt:" << s << endl;
QTextCodec * defaultCodec = encoding_map[s];
encoding_map[""] = defaultCodec;
