CVS update: /cowiki/includes/cowiki/class/render/, /cowiki/includes/cowiki/class/parse/

User: cmarble 
Date: 05/03/15 11:48:53

Modified:
 /cowiki/includes/cowiki/class/render/
  class.FrontHtmlTransformer.php
 /cowiki/includes/cowiki/class/parse/
  class.WikiParser.php

Log:
 Issue number:  196
 Obtained from: 
 Submitted by:  cmarble
 Reviewed by:   
 
 Proper paragraphing behaviour restored to justification.

File Changes:

Directory: /cowiki/includes/cowiki/class/render/
================================================

File [changed]: class.FrontHtmlTransformer.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/class/render/class.FrontHtmlTransformer.php?r1=1.41&r2=1.42
Delta lines:  +3 -4
-------------------
--- class.FrontHtmlTransformer.php	15 Mar 2005 17:16:27 -0000	1.41
+++ class.FrontHtmlTransformer.php	15 Mar 2005 19:48:53 -0000	1.42
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.FrontHtmlTransformer.php,v 1.41 2005/03/15 17:16:27 cmarble Exp $
+ * $Id: class.FrontHtmlTransformer.php,v 1.42 2005/03/15 19:48:53 cmarble Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -17,7 +17,7 @@
  * @author      Daniel T. Gorski, <[email protected]>
  * @copyright   (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license     http://www.gnu.org/licenses/gpl.html
- * @version     $Revision: 1.41 $
+ * @version     $Revision: 1.42 $
  *
  */
 
@@ -732,15 +732,14 @@
     // --------------------------------------------------------------------
 
     protected function &_transformJustification(&$aMatches) {
-      /*
         $sStr =  '<div width="100%" style="text-align:'.$aMatches[1].'">';
         $sStr .= $aMatches[2];
-        $sStr .= '</p>';
-      */
+        $sStr .= '</div>';
+      /*
         $sStr =  '<p width="100%" style="text-align:'.$aMatches[1].'">';
         $sStr .= $aMatches[2];
         $sStr .= '</p>';
-
+      */
         return $sStr;
     }
 

Directory: /cowiki/includes/cowiki/class/parse/
===============================================

File [changed]: class.WikiParser.php
Url: http://cowiki.tigris.org/source/browse/cowiki/includes/cowiki/class/parse/class.WikiParser.php?r1=1.40&r2=1.41
Delta lines:  +1 -1
-------------------
--- class.WikiParser.php	15 Mar 2005 17:16:27 -0000	1.40
+++ class.WikiParser.php	15 Mar 2005 19:48:53 -0000	1.41
@@ -2,7 +2,7 @@
 
 /**
  *
- * $Id: class.WikiParser.php,v 1.40 2005/03/15 17:16:27 cmarble Exp $
+ * $Id: class.WikiParser.php,v 1.41 2005/03/15 19:48:53 cmarble Exp $
  *
  * This file is part of coWiki. coWiki is free software under the terms of
  * the GNU General Public License (GPL). Read the LICENSE file. If you did
@@ -21,7 +21,7 @@
  * @author      Daniel T. Gorski, <[email protected]>
  * @copyright   (C) Daniel T. Gorski, {@link http://www.develnet.org}
  * @license     http://www.gnu.org/licenses/gpl.html
- * @version     $Revision: 1.40 $
+ * @version     $Revision: 1.41 $
  *
  */
 
@@ -672,7 +672,7 @@
     // --------------------------------------------------------------------
 
     protected function createJustificationElement(&$sStr, &$mMeta) {
-	return '<'.$mMeta.'>'.$sStr.'</'.$mMeta.'>';
+	return '<'.$mMeta.'>'.$this->invokeParagraphs($sStr).'</'.$mMeta.'>';
     }
 
     protected function createEmphasisElement(&$sStr, &$mMeta) {