[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KOFFICE_1_3_BRANCH: koffice/lib/kotext
From:       David Faure <faure () kde ! org>
Date:       2004-06-06 23:34:39
Message-ID: 20040606233439.C6DF699E9 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Sync with head - only debug changes, so the reason for the unit test failure must be \
somewhere else...


  M +6 -3      kotextformatter.cc   1.81.2.5
  M +2 -1      tests/.cvsignore   1.1.2.1


--- koffice/lib/kotext/kotextformatter.cc  #1.81.2.4:1.81.2.5
@@ -35,4 +35,7 @@
 //#define DEBUG_FORMATTER_WIDTH
 
+// Hyphenation
+//#define DEBUG_HYPHENATION
+
 /////// keep in sync with kotextformat.cc !
 //#define REF_IS_LU
@@ -209,5 +212,5 @@ bool KoTextFormatterCore::format()
 #else
     if ( availableWidth == 0 )
-        kdDebug(32500) << "KoTextFormatter::format " << parag->paragId() << " \
warning, availableWidth=0" << endl;; +        kdDebug(32500) << \
"KoTextFormatter::format " << parag->paragId() << " warning, availableWidth=0" << \
endl;  if ( maxY == 0 )
         kdDebug(32500) << "KoTextFormatter::format " << parag->paragId() << " \
warning, maxY=0" << endl; @@ -366,5 +369,5 @@ bool KoTextFormatterCore::format()
                     QString lang = string->at(wordStart).format()->language();
                     char * hyphens = settings->hyphenator()->hyphens( word, lang );
-#ifdef DEBUG_FORMATTER
+#if defined(DEBUG_FORMATTER) || defined(DEBUG_HYPHENATION)
                     kdDebug(32500) << "Hyphenation: word=" << word << " lang=" << \
                lang << " hyphens=" << hyphens << " maxlen=" << maxlen << endl;
                     kdDebug(32500) << "Parag indexes: wordStart=" << wordStart << " \
lastBreak=" << lastBreak << " i=" << i << endl; @@ -384,5 +387,5 @@ bool \
KoTextFormatterCore::format()  lastBreak = hypos + wordStart;
                             hyphenated = true;
-#if defined(DEBUG_FORMATTER) || defined(DEBUG_FORMATTER_WIDTH)
+#if defined(DEBUG_FORMATTER) || defined(DEBUG_FORMATTER_WIDTH) || \
defined(DEBUG_HYPHENATION)  kdDebug(32500) << "Hyphenation: will break at " << \
lastBreak << " using tempworddata at position " << hypos << "/" << \
tempWordData.size() << endl;  #endif

--- koffice/lib/kotext/tests/.cvsignore  #1.1:1.1.2.1
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
-koformattertest
+kotextformattertest
+kobordertest


[prev in list] [next in list] [prev in thread] [next in thread]