Browse Source

Fixed warning.

TODO: look at lines which are longer then the editor size and and theirfor
do not reach the code responsable for the smart wrapping of short lines.
Those lines should also be tested on first words.
stekkel 21 years ago
parent
commit
935fc22b6f
1 changed files with 3 additions and 8 deletions
  1. 3 8
      functions/strings.php

+ 3 - 8
functions/strings.php

@@ -213,7 +213,6 @@ function &sqBodyWrap (&$body, $wrap) {
         * Set this to false to stop appending short strings to previous lines
         * Set this to false to stop appending short strings to previous lines
         */
         */
        $smartwrap = true;
        $smartwrap = true;
-
        // inner loop, (obviously) handles wrapping up to
        // inner loop, (obviously) handles wrapping up to
        // the next newline
        // the next newline
        while ($pos < $nextNewline) {
        while ($pos < $nextNewline) {
@@ -221,8 +220,6 @@ function &sqBodyWrap (&$body, $wrap) {
            while (($pos < $nextNewline) && (ctype_space ($body{$pos}))) {
            while (($pos < $nextNewline) && (ctype_space ($body{$pos}))) {
                $pos++;
                $pos++;
            }
            }
-
-
            // if this is a short line then just append it and continue outer loop
            // if this is a short line then just append it and continue outer loop
            if (($outStringCol + $nextNewline - $pos) <= ($wrap - $citeLevel - 1) ) {
            if (($outStringCol + $nextNewline - $pos) <= ($wrap - $citeLevel - 1) ) {
                // if this is the final line in the input string then include
                // if this is the final line in the input string then include
@@ -237,16 +234,15 @@ function &sqBodyWrap (&$body, $wrap) {
                while (($lastRealChar > $pos && $lastRealChar < $length) && (ctype_space ($body{$lastRealChar}))) {
                while (($lastRealChar > $pos && $lastRealChar < $length) && (ctype_space ($body{$lastRealChar}))) {
                    $lastRealChar--;
                    $lastRealChar--;
                }
                }
-
                // decide if appending the short string is what we want
                // decide if appending the short string is what we want
                if (($nextNewline < $length && $body{$nextNewline} == "\n") &&
                if (($nextNewline < $length && $body{$nextNewline} == "\n") &&
                      isset($lastRealChar)) {
                      isset($lastRealChar)) {
-
-                     //check the first word:
-                   $mypos = $nextNewline+1;
+                   $mypos = $pos;
+                   //check the first word:
                    while (($mypos < $length) && ($body{$mypos} == '>')) {
                    while (($mypos < $length) && ($body{$mypos} == '>')) {
                        $mypos++;
                        $mypos++;
                        // skip over any spaces interleaved among the cite markers
                        // skip over any spaces interleaved among the cite markers
+                       $oldpos = $mypos;
                        while (($mypos < $length) && ($body{$mypos} == ' ')) {
                        while (($mypos < $length) && ($body{$mypos} == ' ')) {
                            $mypos++;
                            $mypos++;
                        }
                        }
@@ -261,7 +257,6 @@ function &sqBodyWrap (&$body, $wrap) {
 */
 */
 
 
                    $firstword = substr($body,$mypos,strpos($body,' ',$mypos) - $mypos);
                    $firstword = substr($body,$mypos,strpos($body,' ',$mypos) - $mypos);
-
                    //if ($dowrap || $ldnspacecnt > 1 || ($firstword && (
                    //if ($dowrap || $ldnspacecnt > 1 || ($firstword && (
                    if (!$smartwrap || $firstword && (
                    if (!$smartwrap || $firstword && (
                                         $firstword{0} == '-' ||
                                         $firstword{0} == '-' ||