chamilo / chamilo-lms

main/inc/lib/phpdocx/pdf/include/text_frame_reflower.cls.php

Switch Indentation +105 added lines, -105 removed lines

@@ -56,21 +56,21 @@ 
     // Handle text transform
     $transform = $this->_frame->get_style()->text_transform;
     switch ( strtolower($transform) ) {
-    case "capitalize":
-      $this->_frame->set_text( ucwords($this->_frame->get_text()) );
-      break;
+        case "capitalize":
+          $this->_frame->set_text( ucwords($this->_frame->get_text()) );
+          break;
 
-    case "uppercase":
-      $this->_frame->set_text( strtoupper($this->_frame->get_text()) );
-      break;
+        case "uppercase":
+          $this->_frame->set_text( strtoupper($this->_frame->get_text()) );
+          break;
 
-    case "lowercase":
-      $this->_frame->set_text( strtolower($this->_frame->get_text()) );
-      break;
+        case "lowercase":
+          $this->_frame->set_text( strtolower($this->_frame->get_text()) );
+          break;
 
-    default:
-      // Do nothing
-      break;
+        default:
+          // Do nothing
+          break;
     }
   }
 
@@ -192,20 +192,20 @@ 
 
     switch ($style->text_transform) {
 
-    default:
-      break;
+        default:
+          break;
 
-    case "capitalize":
-      $text = mb_convert_case($text, MB_CASE_TITLE, 'UTF-8');
-      break;
+        case "capitalize":
+          $text = mb_convert_case($text, MB_CASE_TITLE, 'UTF-8');
+          break;
 
-    case "uppercase":
-      $text = mb_convert_case($text, MB_CASE_UPPER, 'UTF-8');
-      break;
+        case "uppercase":
+          $text = mb_convert_case($text, MB_CASE_UPPER, 'UTF-8');
+          break;
 
-    case "lowercase":
-      $text = mb_convert_case($text, MB_CASE_LOWER, 'UTF-8');
-      break;
+        case "lowercase":
+          $text = mb_convert_case($text, MB_CASE_LOWER, 'UTF-8');
+          break;
 
     }
     
@@ -214,51 +214,51 @@ 
 
     switch ($style->white_space) {
 
-    default:
-    case "normal":
-      $this->_frame->set_text( $text = $this->_collapse_white_space($text) );
-      if ( $text == "" )
-        break;
+        default:
+        case "normal":
+          $this->_frame->set_text( $text = $this->_collapse_white_space($text) );
+          if ( $text == "" )
+            break;
 
-      $split = $this->_line_break($text);
-      break;
+          $split = $this->_line_break($text);
+          break;
 
-    case "pre":
-      $split = $this->_newline_break($text);
-      $add_line = $split !== false;
-      break;
+        case "pre":
+          $split = $this->_newline_break($text);
+          $add_line = $split !== false;
+          break;
 
-    case "nowrap":
-      $this->_frame->set_text( $text = $this->_collapse_white_space($text) );
-      break;
+        case "nowrap":
+          $this->_frame->set_text( $text = $this->_collapse_white_space($text) );
+          break;
 
-    case "pre-wrap":
-      $split = $this->_newline_break($text);
+        case "pre-wrap":
+          $split = $this->_newline_break($text);
 
-      if ( ($tmp = $this->_line_break($text)) !== false ) {
-        $add_line = $split < $tmp;
-        $split = min($tmp, $split);
-      } else
-        $add_line = true;
+          if ( ($tmp = $this->_line_break($text)) !== false ) {
+            $add_line = $split < $tmp;
+            $split = min($tmp, $split);
+          } else
+            $add_line = true;
 
-      break;
+          break;
 
-    case "pre-line":
-      // Collapse white-space except for \n
-      $this->_frame->set_text( $text = preg_replace( "/[ \t]+/u", " ", $text ) );
+        case "pre-line":
+          // Collapse white-space except for \n
+          $this->_frame->set_text( $text = preg_replace( "/[ \t]+/u", " ", $text ) );
 
-      if ( $text == "" )
-        break;
+          if ( $text == "" )
+            break;
 
-      $split = $this->_newline_break($text);
+          $split = $this->_newline_break($text);
 
-      if ( ($tmp = $this->_line_break($text)) !== false ) {
-        $add_line = $split < $tmp;
-        $split = min($tmp, $split);
-      } else
-        $add_line = true;
+          if ( ($tmp = $this->_line_break($text)) !== false ) {
+            $add_line = $split < $tmp;
+            $split = min($tmp, $split);
+          } else
+            $add_line = true;
 
-      break;
+          break;
 
     }
 
@@ -351,59 +351,59 @@ 
 
     switch($style->white_space) {
 
-    default:
-    case "normal":
-      $str = preg_replace("/[\s\n]+/u"," ", $str);
-    case "pre-wrap":
-    case "pre-line":
-
-      // Find the longest word (i.e. minimum length)
-
-      // This technique (using arrays & an anonymous function) is actually
-      // faster than doing a single-pass character by character scan.  Heh,
-      // yes I took the time to bench it ;)
-      $words = array_flip(preg_split("/[\s-]+/u",$str, -1, PREG_SPLIT_DELIM_CAPTURE));
-      array_walk($words, create_function('&$val,$str',
-                                         '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
-      arsort($words);
-      $min = reset($words);
-      break;
-
-    case "pre":
-      $lines = array_flip(preg_split("/\n/u", $str));
-      array_walk($lines, create_function('&$val,$str',
-                                         '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
-
-      arsort($lines);
-      $min = reset($lines);
-      break;
-
-    case "nowrap":
-      $min = Font_Metrics::get_text_width($this->_collapse_white_space($str), $font, $size, $spacing);
-      break;
+        default:
+        case "normal":
+          $str = preg_replace("/[\s\n]+/u"," ", $str);
+        case "pre-wrap":
+        case "pre-line":
+
+          // Find the longest word (i.e. minimum length)
+
+          // This technique (using arrays & an anonymous function) is actually
+          // faster than doing a single-pass character by character scan.  Heh,
+          // yes I took the time to bench it ;)
+          $words = array_flip(preg_split("/[\s-]+/u",$str, -1, PREG_SPLIT_DELIM_CAPTURE));
+          array_walk($words, create_function('&$val,$str',
+                                             '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
+          arsort($words);
+          $min = reset($words);
+          break;
+
+        case "pre":
+          $lines = array_flip(preg_split("/\n/u", $str));
+          array_walk($lines, create_function('&$val,$str',
+                                             '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
+
+          arsort($lines);
+          $min = reset($lines);
+          break;
+
+        case "nowrap":
+          $min = Font_Metrics::get_text_width($this->_collapse_white_space($str), $font, $size, $spacing);
+          break;
 
     }
 
     switch ($style->white_space) {
 
-    default:
-    case "normal":
-    case "nowrap":
-      $str = preg_replace("/[\s\n]+/u"," ", $text);
-      break;
-
-    case "pre-line":
-      $str = preg_replace( "/[ \t]+/u", " ", $text);
-
-    case "pre-wrap":
-      // Find the longest word (i.e. minimum length)
-      $lines = array_flip(preg_split("/\n/", $text));
-      array_walk($lines, create_function('&$val,$str',
-                                         '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
-      arsort($lines);
-      reset($lines);
-      $str = key($lines);
-      break;
+        default:
+        case "normal":
+        case "nowrap":
+          $str = preg_replace("/[\s\n]+/u"," ", $text);
+          break;
+
+        case "pre-line":
+          $str = preg_replace( "/[ \t]+/u", " ", $text);
+
+        case "pre-wrap":
+          // Find the longest word (i.e. minimum length)
+          $lines = array_flip(preg_split("/\n/", $text));
+          array_walk($lines, create_function('&$val,$str',
+                                             '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
+          arsort($lines);
+          reset($lines);
+          $str = key($lines);
+          break;
 
     }
 

main/inc/lib/phpdocx/pdf/include/block_frame_reflower.cls.php

Switch Indentation +64 added lines, -64 removed lines

@@ -404,60 +404,60 @@ 
     // http://www.w3.org/TR/CSS21/text.html#propdef-text-align
     switch ($style->text_align) {
 
-    default:
-    case "left":
-      return;
+        default:
+        case "left":
+          return;
 
-    case "right":
-      foreach ($this->_frame->get_lines() as $line) {
+        case "right":
+          foreach ($this->_frame->get_lines() as $line) {
 
-        // Move each child over by $dx
-        $dx = $width - $line["w"];
-        foreach($line["frames"] as $frame)
-          $frame->set_position( $frame->get_position("x") + $dx );
+            // Move each child over by $dx
+            $dx = $width - $line["w"];
+            foreach($line["frames"] as $frame)
+              $frame->set_position( $frame->get_position("x") + $dx );
 
-      }
-      break;
+          }
+          break;
 
 
-    case "justify":
-      foreach ($this->_frame->get_lines() as $i => $line) {
+        case "justify":
+          foreach ($this->_frame->get_lines() as $i => $line) {
 
-        // Only set the spacing if the line is long enough.  This is really
-        // just an aesthetic choice ;)
-        if ( $line["w"] > self::MIN_JUSTIFY_WIDTH * $width ) {
-          // Set the spacing for each child
-          if ( $line["wc"] > 1 )
-            $spacing = ($width - $line["w"]) / ($line["wc"] - 1);
-          else
-            $spacing = 0;
+            // Only set the spacing if the line is long enough.  This is really
+            // just an aesthetic choice ;)
+            if ( $line["w"] > self::MIN_JUSTIFY_WIDTH * $width ) {
+              // Set the spacing for each child
+              if ( $line["wc"] > 1 )
+                $spacing = ($width - $line["w"]) / ($line["wc"] - 1);
+              else
+                $spacing = 0;
 
-          $dx = 0;
-          foreach($line["frames"] as $frame) {
-            if ( !$frame instanceof Text_Frame_Decorator )
-              continue;
+              $dx = 0;
+              foreach($line["frames"] as $frame) {
+                if ( !$frame instanceof Text_Frame_Decorator )
+                  continue;
 
-            $frame->set_position( $frame->get_position("x") + $dx );
-            $frame->set_text_spacing($spacing);
-            $dx += mb_substr_count($frame->get_text(), " ") * $spacing;
-          }
+                $frame->set_position( $frame->get_position("x") + $dx );
+                $frame->set_text_spacing($spacing);
+                $dx += mb_substr_count($frame->get_text(), " ") * $spacing;
+              }
 
-          // The line (should) now occupy the entire width
-          $this->_frame->set_line($i, null, $width);
+              // The line (should) now occupy the entire width
+              $this->_frame->set_line($i, null, $width);
 
-        }
-      }
-      break;
-
-    case "center":
-    case "centre":
-      foreach ($this->_frame->get_lines() as $i => $line) {
-        // Centre each line by moving each frame in the line by:
-        $dx = ($width - $line["w"]) / 2;
-        foreach ($line["frames"] as $frame)
-          $frame->set_position( $frame->get_position("x") + $dx );
-      }
-      break;
+            }
+          }
+          break;
+
+        case "center":
+        case "centre":
+          foreach ($this->_frame->get_lines() as $i => $line) {
+            // Centre each line by moving each frame in the line by:
+            $dx = ($width - $line["w"]) / 2;
+            foreach ($line["frames"] as $frame)
+              $frame->set_position( $frame->get_position("x") + $dx );
+          }
+          break;
     }
 
   }
@@ -480,31 +480,31 @@ 
 
         switch ($align) {
 
-        case "baseline":
-          $y = $line["y"] + $line["h"] - $frame_h;
-          break;
+            case "baseline":
+              $y = $line["y"] + $line["h"] - $frame_h;
+              break;
 
-        case "middle":
-          $y = $line["y"] + ($line["h"] + $frame_h) / 2;
-          break;
+            case "middle":
+              $y = $line["y"] + ($line["h"] + $frame_h) / 2;
+              break;
 
-        case "sub":
-          $y = $line["y"] + 0.9 * $line["h"];
-          break;
+            case "sub":
+              $y = $line["y"] + 0.9 * $line["h"];
+              break;
 
-        case "super":
-          $y = $line["y"] + 0.1 * $line["h"];
-          break;
+            case "super":
+              $y = $line["y"] + 0.1 * $line["h"];
+              break;
 
-        case  "text-top":
-        case "top": // Not strictly accurate, but good enough for now
-          $y = $line["y"];
-          break;
+            case  "text-top":
+            case "top": // Not strictly accurate, but good enough for now
+              $y = $line["y"];
+              break;
 
-        case "text-bottom":
-        case "bottom":
-          $y = $line["y"] + $line["h"] - $frame_h;
-          break;
+            case "text-bottom":
+            case "bottom":
+              $y = $line["y"] + $line["h"] - $frame_h;
+              break;
         }
 
         $x = $frame->get_position("x");

main/inc/lib/phpdocx/pdf/include/abstract_renderer.cls.php

Switch Indentation +245 added lines, -245 removed lines

@@ -299,21 +299,21 @@ 
 
     switch (strtolower($ext)) {
 
-    case "png":
-      $src = imagecreatefrompng($img);
-      break;
+        case "png":
+          $src = imagecreatefrompng($img);
+          break;
 
-    case "jpg":
-    case "jpeg":
-      $src = imagecreatefromjpeg($img);
-      break;
+        case "jpg":
+        case "jpeg":
+          $src = imagecreatefromjpeg($img);
+          break;
 
-    case "gif":
-      $src = imagecreatefromgif($img);
-      break;
+        case "gif":
+          $src = imagecreatefromgif($img);
+          break;
 
-    default:
-      return; // Unsupported image type
+        default:
+          return; // Unsupported image type
     }
 
     if ($src == null) {
@@ -475,22 +475,22 @@ 
     
     switch ($side) {
 
-    case "top":
-      $delta = $top / 2;
-    case "bottom":
-      $delta = isset($delta) ? $delta : -$bottom / 2;
-      $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, $dash);
-      break;
-
-    case "left":
-      $delta = $left / 2;
-    case "right":
-      $delta = isset($delta) ? $delta : - $right / 2;
-      $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, $dash);
-      break;
-
-    default:
-      return;
+        case "top":
+          $delta = $top / 2;
+        case "bottom":
+          $delta = isset($delta) ? $delta : -$bottom / 2;
+          $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, $dash);
+          break;
+
+        case "left":
+          $delta = $left / 2;
+        case "right":
+          $delta = isset($delta) ? $delta : - $right / 2;
+          $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, $dash);
+          break;
+
+        default:
+          return;
 
     }
   }
@@ -501,22 +501,22 @@ 
 
     switch ($side) {
 
-    case "top":
-      $delta = $top / 2;
-    case "bottom":
-      $delta = isset($delta) ? $delta : -$bottom / 2;
-      $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, array(3 * $$side));
-      break;
-
-    case "left":
-      $delta = $left / 2;
-    case "right":
-      $delta = isset($delta) ? $delta : - $right / 2;
-      $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, array(3 * $$side));
-      break;
-
-    default:
-      return;
+        case "top":
+          $delta = $top / 2;
+        case "bottom":
+          $delta = isset($delta) ? $delta : -$bottom / 2;
+          $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, array(3 * $$side));
+          break;
+
+        case "left":
+          $delta = $left / 2;
+        case "right":
+          $delta = isset($delta) ? $delta : - $right / 2;
+          $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, array(3 * $$side));
+          break;
+
+        default:
+          return;
     }
     
   }
@@ -528,57 +528,57 @@ 
     // All this polygon business is for beveled corners...
     switch ($side) {
 
-    case "top":
-      if ( $corner_style === "bevel" ) {
+        case "top":
+          if ( $corner_style === "bevel" ) {
         
-        $points = array($x, $y,
-                        $x + $length, $y,
-                        $x + $length - $right, $y + $top,
-                        $x + $left, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y, $length, $top, $color);
+            $points = array($x, $y,
+                            $x + $length, $y,
+                            $x + $length - $right, $y + $top,
+                            $x + $left, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
+          } else
+            $this->_canvas->filled_rectangle($x, $y, $length, $top, $color);
       
-      break;
+          break;
       
-    case "bottom":
-      if ( $corner_style === "bevel" ) {
-        $points = array($x, $y,
-                        $x + $length, $y,
-                        $x + $length - $right, $y - $bottom,
-                        $x + $left, $y - $bottom);
-        $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $bottom, $color);
+        case "bottom":
+          if ( $corner_style === "bevel" ) {
+            $points = array($x, $y,
+                            $x + $length, $y,
+                            $x + $length - $right, $y - $bottom,
+                            $x + $left, $y - $bottom);
+            $this->_canvas->polygon($points, $color, null, null, true);
+          } else
+            $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $bottom, $color);
       
-      break;
+          break;
       
-    case "left":
-      if ( $corner_style === "bevel" ) {
-        $points = array($x, $y,
-                        $x, $y + $length,
-                        $x + $left, $y + $length - $bottom,
-                        $x + $left, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y, $left, $length, $color);
+        case "left":
+          if ( $corner_style === "bevel" ) {
+            $points = array($x, $y,
+                            $x, $y + $length,
+                            $x + $left, $y + $length - $bottom,
+                            $x + $left, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
+          } else
+            $this->_canvas->filled_rectangle($x, $y, $left, $length, $color);
       
-      break;
+          break;
       
-    case "right":
-      if ( $corner_style === "bevel" ) {
-        $points = array($x, $y,
-                        $x, $y + $length,
-                        $x - $right, $y + $length - $bottom,
-                        $x - $right, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x - $right, $y, $right, $length, $color);
-
-      break;
-
-    default:
-      return;
+        case "right":
+          if ( $corner_style === "bevel" ) {
+            $points = array($x, $y,
+                            $x, $y + $length,
+                            $x - $right, $y + $length - $bottom,
+                            $x - $right, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
+          } else
+            $this->_canvas->filled_rectangle($x - $right, $y, $right, $length, $color);
+
+          break;
+
+        default:
+          return;
 
     }
         
@@ -595,105 +595,105 @@ 
     // inner bottom, inner top.
     switch ($side) {
 
-    case "top":
-      if ( $corner_style === "bevel" ) {
-        $left_line_width = $left / 4;
-        $right_line_width = $right / 4;
+        case "top":
+          if ( $corner_style === "bevel" ) {
+            $left_line_width = $left / 4;
+            $right_line_width = $right / 4;
         
-        $points = array($x, $y,
-                        $x + $length, $y,
-                        $x + $length - $right_line_width, $y + $line_width,
-                        $x + $left_line_width, $y + $line_width,);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x, $y,
+                            $x + $length, $y,
+                            $x + $length - $right_line_width, $y + $line_width,
+                            $x + $left_line_width, $y + $line_width,);
+            $this->_canvas->polygon($points, $color, null, null, true);
         
-        $points = array($x + $left - $left_line_width, $y + $top - $line_width,
-                        $x + $length - $right + $right_line_width, $y + $top - $line_width,
-                        $x + $length - $right, $y + $top,
-                        $x + $left, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x + $left - $left_line_width, $y + $top - $line_width,
+                            $x + $length - $right + $right_line_width, $y + $top - $line_width,
+                            $x + $length - $right, $y + $top,
+                            $x + $left, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
-        $this->_canvas->filled_rectangle($x, $y, $length, $line_width, $color);
-        $this->_canvas->filled_rectangle($x, $y + $top - $line_width, $length, $line_width, $color);
+          } else {
+            $this->_canvas->filled_rectangle($x, $y, $length, $line_width, $color);
+            $this->_canvas->filled_rectangle($x, $y + $top - $line_width, $length, $line_width, $color);
 
-      }
-      break;
+          }
+          break;
       
-    case "bottom":
-      if ( $corner_style === "bevel" ) {
-        $left_line_width = $left / 4;
-        $right_line_width = $right / 4;
+        case "bottom":
+          if ( $corner_style === "bevel" ) {
+            $left_line_width = $left / 4;
+            $right_line_width = $right / 4;
         
-        $points = array($x, $y,
-                        $x + $length, $y,
-                        $x + $length - $right_line_width, $y - $line_width,
-                        $x + $left_line_width, $y - $line_width);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x, $y,
+                            $x + $length, $y,
+                            $x + $length - $right_line_width, $y - $line_width,
+                            $x + $left_line_width, $y - $line_width);
+            $this->_canvas->polygon($points, $color, null, null, true);
         
-        $points = array($x + $left - $left_line_width, $y - $bottom + $line_width,
-                        $x + $length - $right + $right_line_width, $y - $bottom + $line_width,
-                        $x + $length - $right, $y - $bottom,
-                        $x + $left, $y - $bottom);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x + $left - $left_line_width, $y - $bottom + $line_width,
+                            $x + $length - $right + $right_line_width, $y - $bottom + $line_width,
+                            $x + $length - $right, $y - $bottom,
+                            $x + $left, $y - $bottom);
+            $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
-        $this->_canvas->filled_rectangle($x, $y - $line_width, $length, $line_width, $color);
-        $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $line_width, $color);
-      }
+          } else {
+            $this->_canvas->filled_rectangle($x, $y - $line_width, $length, $line_width, $color);
+            $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $line_width, $color);
+          }
           
-      break;
+          break;
 
-    case "left":
-      if ( $corner_style === "bevel" ) {
-        $top_line_width = $top / 4;
-        $bottom_line_width = $bottom / 4;
+        case "left":
+          if ( $corner_style === "bevel" ) {
+            $top_line_width = $top / 4;
+            $bottom_line_width = $bottom / 4;
         
-        $points = array($x, $y,
-                        $x, $y + $length,
-                        $x + $line_width, $y + $length - $bottom_line_width,
-                        $x + $line_width, $y + $top_line_width);
-        $this->_canvas->polygon($points, $color, null, null, true);
-
-        $points = array($x + $left - $line_width, $y + $top - $top_line_width,
-                        $x + $left - $line_width, $y + $length - $bottom + $bottom_line_width,
-                        $x + $left, $y + $length - $bottom,
-                        $x + $left, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x, $y,
+                            $x, $y + $length,
+                            $x + $line_width, $y + $length - $bottom_line_width,
+                            $x + $line_width, $y + $top_line_width);
+            $this->_canvas->polygon($points, $color, null, null, true);
+
+            $points = array($x + $left - $line_width, $y + $top - $top_line_width,
+                            $x + $left - $line_width, $y + $length - $bottom + $bottom_line_width,
+                            $x + $left, $y + $length - $bottom,
+                            $x + $left, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
-        $this->_canvas->filled_rectangle($x, $y, $line_width, $length, $color);
-        $this->_canvas->filled_rectangle($x + $left - $line_width, $y, $line_width, $length, $color);
-      }
+          } else {
+            $this->_canvas->filled_rectangle($x, $y, $line_width, $length, $color);
+            $this->_canvas->filled_rectangle($x + $left - $line_width, $y, $line_width, $length, $color);
+          }
       
-      break;
+          break;
                       
-    case "right":
-      if ( $corner_style === "bevel" ) {
-        $top_line_width = $top / 4;
-        $bottom_line_width = $bottom / 4;
+        case "right":
+          if ( $corner_style === "bevel" ) {
+            $top_line_width = $top / 4;
+            $bottom_line_width = $bottom / 4;
         
       
-        $points = array($x, $y,
-                      $x, $y + $length,
-                        $x - $line_width, $y + $length - $bottom_line_width,
-                        $x - $line_width, $y + $top_line_width);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x, $y,
+                          $x, $y + $length,
+                            $x - $line_width, $y + $length - $bottom_line_width,
+                            $x - $line_width, $y + $top_line_width);
+            $this->_canvas->polygon($points, $color, null, null, true);
         
-        $points = array($x - $right + $line_width, $y + $top - $top_line_width,
-                        $x - $right + $line_width, $y + $length - $bottom + $bottom_line_width,
-                        $x - $right, $y + $length - $bottom,
-                        $x - $right, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x - $right + $line_width, $y + $top - $top_line_width,
+                            $x - $right + $line_width, $y + $length - $bottom + $bottom_line_width,
+                            $x - $right, $y + $length - $bottom,
+                            $x - $right, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
-        $this->_canvas->filled_rectangle($x - $line_width, $y, $line_width, $length, $color);
-        $this->_canvas->filled_rectangle($x - $right, $y, $line_width, $length, $color);
-      }
+          } else {
+            $this->_canvas->filled_rectangle($x - $line_width, $y, $line_width, $length, $color);
+            $this->_canvas->filled_rectangle($x - $right, $y, $line_width, $length, $color);
+          }
       
-      break;
+          break;
 
-    default:
-      return;
+        default:
+          return;
 
     }
         
@@ -708,32 +708,32 @@ 
 
     switch ($side) {
 
-    case "top":
-      $x += $left / 2;
-      $y += $top / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
-
-    case "bottom":
-      $x += $left / 2;
-      $y -= $bottom / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
-
-    case "left":
-      $x += $left / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
-
-    case "right":
-      $x -= $right / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
-
-    default:
-      return;
+        case "top":
+          $x += $left / 2;
+          $y += $top / 2;
+          $length -= $left / 2 + $right / 2;
+          break;
+
+        case "bottom":
+          $x += $left / 2;
+          $y -= $bottom / 2;
+          $length -= $left / 2 + $right / 2;
+          break;
+
+        case "left":
+          $x += $left / 2;
+          $y += $top / 2;
+          $length -= $top / 2 + $bottom / 2;
+          break;
+
+        case "right":
+          $x -= $right / 2;
+          $y += $top / 2;
+          $length -= $top / 2 + $bottom / 2;
+          break;
+
+        default:
+          return;
 
     }
 
@@ -750,32 +750,32 @@ 
 
     switch ($side) {
 
-    case "top":
-      $x += $left / 2;
-      $y += $top / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
-
-    case "bottom":
-      $x += $left / 2;
-      $y -= $bottom / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
-
-    case "left":
-      $x += $left / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
-
-    case "right":
-      $x -= $right / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
-
-    default:
-      return;
+        case "top":
+          $x += $left / 2;
+          $y += $top / 2;
+          $length -= $left / 2 + $right / 2;
+          break;
+
+        case "bottom":
+          $x += $left / 2;
+          $y -= $bottom / 2;
+          $length -= $left / 2 + $right / 2;
+          break;
+
+        case "left":
+          $x += $left / 2;
+          $y += $top / 2;
+          $length -= $top / 2 + $bottom / 2;
+          break;
+
+        case "right":
+          $x -= $right / 2;
+          $y += $top / 2;
+          $length -= $top / 2 + $bottom / 2;
+          break;
+
+        default:
+          return;
 
     }
 
@@ -802,20 +802,20 @@ 
     
     switch ($side) {
 
-    case "top":
-    case "left":
-      $shade = array_map(array($this, "_shade"), $color);
-      $this->_border_solid($x, $y, $length, $shade, $widths, $side);
-      break;
+        case "top":
+        case "left":
+          $shade = array_map(array($this, "_shade"), $color);
+          $this->_border_solid($x, $y, $length, $shade, $widths, $side);
+          break;
 
-    case "bottom":
-    case "right":
-      $tint = array_map(array($this, "_tint"), $color);
-      $this->_border_solid($x, $y, $length, $tint, $widths, $side);
-      break;
+        case "bottom":
+        case "right":
+          $tint = array_map(array($this, "_tint"), $color);
+          $this->_border_solid($x, $y, $length, $tint, $widths, $side);
+          break;
 
-    default:
-      return;
+        default:
+          return;
     }
   }
   
@@ -823,20 +823,20 @@ 
     list($top, $right, $bottom, $left) = $widths;
     
     switch ($side) {
-    case "top":
-    case "left":
-      $tint = array_map(array($this, "_tint"), $color);
-      $this->_border_solid($x, $y, $length, $tint, $widths, $side);
-      break;
-
-    case "bottom":
-    case "right":
-      $shade = array_map(array($this, "_shade"), $color);
-      $this->_border_solid($x, $y, $length, $shade, $widths, $side);
-      break;
-
-    default:
-      return;
+        case "top":
+        case "left":
+          $tint = array_map(array($this, "_tint"), $color);
+          $this->_border_solid($x, $y, $length, $tint, $widths, $side);
+          break;
+
+        case "bottom":
+        case "right":
+          $shade = array_map(array($this, "_shade"), $color);
+          $this->_border_solid($x, $y, $length, $shade, $widths, $side);
+          break;
+
+        default:
+          return;
 
     }
   }

main/inc/lib/phpdocx/pdf/include/block_renderer.cls.php

Switch Indentation +19 added lines, -19 removed lines

@@ -86,25 +86,25 @@
 
 
       switch($side) {
-      case "top":
-        $length = $w;
-        break;
-
-      case "bottom":
-        $length = $w;
-        $y += $h;
-        break;
-
-      case "left":
-        $length = $h;
-        break;
-
-      case "right":
-        $length = $h;
-        $x += $w;
-        break;
-      default:
-        break;
+          case "top":
+            $length = $w;
+            break;
+
+          case "bottom":
+            $length = $w;
+            $y += $h;
+            break;
+
+          case "left":
+            $length = $h;
+            break;
+
+          case "right":
+            $length = $h;
+            $x += $w;
+            break;
+          default:
+            break;
       }
       $method = "_border_" . $props["style"];
 

main/inc/lib/phpdocx/pdf/include/renderer.cls.php

Switch Indentation +71 added lines, -71 removed lines

@@ -88,58 +88,58 @@ 
     
     switch ($display) {
       
-    case "block":
-    case "list-item":
-    case "inline-block":
-    case "table":
-    case "table-row-group":
-    case "table-header-group":
-    case "table-footer-group":
-    case "inline-table":
-      $this->_render_frame("block", $frame);
-      break;
-
-    case "inline":
-      if ( $frame->get_node()->nodeName === "#text" )
-        $this->_render_frame("text", $frame);
-      else
-        $this->_render_frame("inline", $frame);
-      break;
-
-    case "table-cell":
-      $this->_render_frame("table-cell", $frame);
-      break;
-
-    case "-dompdf-list-bullet":
-      $this->_render_frame("list-bullet", $frame);
-      break;
-
-    case "-dompdf-image":
-      $this->_render_frame("image", $frame);
-      break;
+        case "block":
+        case "list-item":
+        case "inline-block":
+        case "table":
+        case "table-row-group":
+        case "table-header-group":
+        case "table-footer-group":
+        case "inline-table":
+          $this->_render_frame("block", $frame);
+          break;
+
+        case "inline":
+          if ( $frame->get_node()->nodeName === "#text" )
+            $this->_render_frame("text", $frame);
+          else
+            $this->_render_frame("inline", $frame);
+          break;
+
+        case "table-cell":
+          $this->_render_frame("table-cell", $frame);
+          break;
+
+        case "-dompdf-list-bullet":
+          $this->_render_frame("list-bullet", $frame);
+          break;
+
+        case "-dompdf-image":
+          $this->_render_frame("image", $frame);
+          break;
       
-    case "none":
-      $node = $frame->get_node();
+        case "none":
+          $node = $frame->get_node();
           
-      if ( $node->nodeName === "script" ) {
-        if ( $node->getAttribute("type") === "text/php" ||
-             $node->getAttribute("language") === "php" ) {
-          // Evaluate embedded php scripts
-          $this->_render_frame("php", $frame);
-        }
+          if ( $node->nodeName === "script" ) {
+            if ( $node->getAttribute("type") === "text/php" ||
+                 $node->getAttribute("language") === "php" ) {
+              // Evaluate embedded php scripts
+              $this->_render_frame("php", $frame);
+            }
         
-        elseif ( $node->getAttribute("type") === "text/javascript" ||
-             $node->getAttribute("language") === "javascript" ) {
-          // Insert JavaScript
-          $this->_render_frame("javascript", $frame);
-        }
-      }
+            elseif ( $node->getAttribute("type") === "text/javascript" ||
+                 $node->getAttribute("language") === "javascript" ) {
+              // Insert JavaScript
+              $this->_render_frame("javascript", $frame);
+            }
+          }
 
-      // Don't render children, so skip to next iter
-      return;
+          // Don't render children, so skip to next iter
+          return;
       
-    default:
-      break;
+        default:
+          break;
 
     }
 
@@ -195,37 +195,37 @@ 
     if ( !isset($this->_renderers[$type]) ) {
       
       switch ($type) {
-      case "block":
-        $this->_renderers["block"] = new Block_Renderer($this->_dompdf);
-        break;
+          case "block":
+            $this->_renderers["block"] = new Block_Renderer($this->_dompdf);
+            break;
 
-      case "inline":
-        $this->_renderers["inline"] = new Inline_Renderer($this->_dompdf);
-        break;
+          case "inline":
+            $this->_renderers["inline"] = new Inline_Renderer($this->_dompdf);
+            break;
 
-      case "text":
-        $this->_renderers["text"] = new Text_Renderer($this->_dompdf);
-        break;
+          case "text":
+            $this->_renderers["text"] = new Text_Renderer($this->_dompdf);
+            break;
 
-      case "image":
-        $this->_renderers["image"] = new Image_Renderer($this->_dompdf);
-        break;
+          case "image":
+            $this->_renderers["image"] = new Image_Renderer($this->_dompdf);
+            break;
       
-      case "table-cell":
-        $this->_renderers["table-cell"] = new Table_Cell_Renderer($this->_dompdf);
-        break;
+          case "table-cell":
+            $this->_renderers["table-cell"] = new Table_Cell_Renderer($this->_dompdf);
+            break;
 
-      case "list-bullet":
-        $this->_renderers["list-bullet"] = new List_Bullet_Renderer($this->_dompdf);
-        break;
+          case "list-bullet":
+            $this->_renderers["list-bullet"] = new List_Bullet_Renderer($this->_dompdf);
+            break;
 
-      case "php":
-        $this->_renderers["php"] = new PHP_Evaluator($this->_canvas);
-        break;
+          case "php":
+            $this->_renderers["php"] = new PHP_Evaluator($this->_canvas);
+            break;
 
-      case "javascript":
-        $this->_renderers["javascript"] = new Javascript_Embedder($this->_dompdf);
-        break;
+          case "javascript":
+            $this->_renderers["javascript"] = new Javascript_Embedder($this->_dompdf);
+            break;
         
       }
     }

main/inc/lib/phpdocx/pdf/include/frame_factory.cls.php

Switch Indentation +88 added lines, -88 removed lines

@@ -65,100 +65,100 @@
       throw new Exception("foo");
     switch ($frame->get_style()->display) {
       
-    case "block":
-      $positioner = "Block";        
-      $decorator = "Block";
-      $reflower = "Block";
-      break;
+        case "block":
+          $positioner = "Block";        
+          $decorator = "Block";
+          $reflower = "Block";
+          break;
     
-    case "inline-block":
-      $positioner = "Inline";
-      $decorator = "Block";
-      $reflower = "Block";
-      break;
-
-    case "inline":
-      $positioner = "Inline";
-      if ( $frame->get_node()->nodeName === "#text" ) {
-        $decorator = "Text";
-        $reflower = "Text";
-      } else {
-        $decorator = "Inline";
-        $reflower = "Inline";
-      }
-      break;   
-
-    case "table":
-      $positioner = "Block";
-      $decorator = "Table";
-      $reflower = "Table";
-      break;
+        case "inline-block":
+          $positioner = "Inline";
+          $decorator = "Block";
+          $reflower = "Block";
+          break;
+
+        case "inline":
+          $positioner = "Inline";
+          if ( $frame->get_node()->nodeName === "#text" ) {
+            $decorator = "Text";
+            $reflower = "Text";
+          } else {
+            $decorator = "Inline";
+            $reflower = "Inline";
+          }
+          break;   
+
+        case "table":
+          $positioner = "Block";
+          $decorator = "Table";
+          $reflower = "Table";
+          break;
       
-    case "inline-table":
-      $positioner = "Inline";
-      $decorator = "Table";
-      $reflower = "Table";
-      break;
-
-    case "table-row-group":
-    case "table-header-group":
-    case "table-footer-group":
-      $positioner = "Null";
-      $decorator = "Table_Row_Group";
-      $reflower = "Table_Row_Group";
-      break;
+        case "inline-table":
+          $positioner = "Inline";
+          $decorator = "Table";
+          $reflower = "Table";
+          break;
+
+        case "table-row-group":
+        case "table-header-group":
+        case "table-footer-group":
+          $positioner = "Null";
+          $decorator = "Table_Row_Group";
+          $reflower = "Table_Row_Group";
+          break;
       
-    case "table-row":
-      $positioner = "Null";
-      $decorator = "Table_Row";
-      $reflower = "Table_Row";
-      break;
-
-    case "table-cell":
-      $positioner = "Table_Cell";
-      $decorator = "Table_Cell";
-      $reflower = "Table_Cell";
-      break;
+        case "table-row":
+          $positioner = "Null";
+          $decorator = "Table_Row";
+          $reflower = "Table_Row";
+          break;
+
+        case "table-cell":
+          $positioner = "Table_Cell";
+          $decorator = "Table_Cell";
+          $reflower = "Table_Cell";
+          break;
         
-    case "list-item":
-      $positioner = "Block";
-      $decorator  = "Block";
-      $reflower   = "Block";
-      break;
-
-    case "-dompdf-list-bullet":
-      if ( $frame->get_style()->list_style_position === "inside" )
-        $positioner = "Inline";
-      else        
-        $positioner = "List_Bullet";
-
-      if ( $frame->get_style()->list_style_image !== "none" )
-        $decorator = "List_Bullet_Image";
-      else
-        $decorator = "List_Bullet";
+        case "list-item":
+          $positioner = "Block";
+          $decorator  = "Block";
+          $reflower   = "Block";
+          break;
+
+        case "-dompdf-list-bullet":
+          if ( $frame->get_style()->list_style_position === "inside" )
+            $positioner = "Inline";
+          else        
+            $positioner = "List_Bullet";
+
+          if ( $frame->get_style()->list_style_image !== "none" )
+            $decorator = "List_Bullet_Image";
+          else
+            $decorator = "List_Bullet";
       
-      $reflower = "List_Bullet";
-      break;
-
-    case "-dompdf-image":
-      $positioner = "Inline";
-      $decorator = "Image";
-      $reflower = "Image";
-      break;
+          $reflower = "List_Bullet";
+          break;
+
+        case "-dompdf-image":
+          $positioner = "Inline";
+          $decorator = "Image";
+          $reflower = "Image";
+          break;
       
-    case "-dompdf-br":
-      $positioner = "Inline";
-      $decorator = "Inline";
-      $reflower = "Inline";
-      break;
-
-    default:
-      // FIXME: should throw some sort of warning or something?
-    case "none":
-      $positioner = "Null";
-      $decorator = "Null";
-      $reflower = "Null";
-      break;
+        case "-dompdf-br":
+          $positioner = "Inline";
+          $decorator = "Inline";
+          $reflower = "Inline";
+          break;
+
+        default:
+          // FIXME: should throw some sort of warning or something?
+        case "none":
+          $positioner = "Null";
+          $decorator = "Null";
+          $reflower = "Null";
+          break;
 
     }
 

main/inc/lib/phpdocx/pdf/include/text_renderer.cls.php

Switch Indentation +11 added lines, -11 removed lines

@@ -132,20 +132,20 @@
 
       switch ($text_deco) {
 
-      default:
-        continue;
+          default:
+            continue;
 
-      case "underline":
-        $deco_y += $base - $descent+ $size * (self::UNDERLINE_OFFSET - self::DECO_THICKNESS/2);
-        break;
+          case "underline":
+            $deco_y += $base - $descent+ $size * (self::UNDERLINE_OFFSET - self::DECO_THICKNESS/2);
+            break;
 
-      case "overline":
-        $deco_y += $size * (self::OVERLINE_OFFSET + self::DECO_THICKNESS/2);
-        break;
+          case "overline":
+            $deco_y += $size * (self::OVERLINE_OFFSET + self::DECO_THICKNESS/2);
+            break;
 
-      case "line-through":
-        $deco_y += $base * 0.7 + $size * self::LINETHROUGH_OFFSET;
-        break;
+          case "line-through":
+            $deco_y += $base * 0.7 + $size * self::LINETHROUGH_OFFSET;
+            break;
 
       }
 

main/inc/lib/phpdocx/pdf/include/cpdf_adapter.cls.php

Switch Indentation +58 added lines, -58 removed lines

@@ -595,56 +595,56 @@ 
     $img_type = mb_strtolower($img_type);
 
     switch ($img_type) {
-    case "jpeg":
-    case "jpg":
-      //debugpng
-      if (DEBUGPNG)  print '!!!jpg!!!';
+        case "jpeg":
+        case "jpg":
+          //debugpng
+          if (DEBUGPNG)  print '!!!jpg!!!';
 
-      $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+          $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          break;
 
-    case "png":
-      //debugpng
-      if (DEBUGPNG)  print '!!!png!!!';
-
-      $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
-
-    case "gif":
-      // Convert gifs to pngs
-      //DEBUG_IMG_TEMP
-      //if (0) {
-      if ( method_exists( $this->_pdf, "addImagePng" ) ) {
-        //debugpng
-        if (DEBUGPNG)  print '!!!gif addImagePng!!!';
-
-      	//If optimization to direct png creation from gd object is available,
-        //don't create temp file, but place gd object directly into the pdf
-	    if ( method_exists( $this->_pdf, "image_iscached" ) &&
-	         $this->_pdf->image_iscached($img_url) ) {
-	      //If same image has occured already before, no need to load because
-	      //duplicate will anyway be eliminated.
-	      $img = null;
-	    } else {
-    	  $img = @imagecreatefromgif($img_url);
-    	  if (!$img) {
-      	    return;
-    	  }
-    	  imageinterlace($img, 0);
-    	}
-    	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
-      } else {
-        //debugpng
-        if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
-        $img_url = $this->_convert_gif_to_png($img_url);
-        $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      }
-      break;
+        case "png":
+          //debugpng
+          if (DEBUGPNG)  print '!!!png!!!';
 
-    default:
-      //debugpng
-      if (DEBUGPNG) print '!!!unknown!!!';
-      break;
+          $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          break;
+
+        case "gif":
+          // Convert gifs to pngs
+          //DEBUG_IMG_TEMP
+          //if (0) {
+          if ( method_exists( $this->_pdf, "addImagePng" ) ) {
+            //debugpng
+            if (DEBUGPNG)  print '!!!gif addImagePng!!!';
+
+      	    //If optimization to direct png creation from gd object is available,
+            //don't create temp file, but place gd object directly into the pdf
+	        if ( method_exists( $this->_pdf, "image_iscached" ) &&
+	             $this->_pdf->image_iscached($img_url) ) {
+	          //If same image has occured already before, no need to load because
+	          //duplicate will anyway be eliminated.
+	          $img = null;
+	        } else {
+    	      $img = @imagecreatefromgif($img_url);
+    	      if (!$img) {
+      	        return;
+    	      }
+    	      imageinterlace($img, 0);
+    	    }
+    	    $this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
+          } else {
+            //debugpng
+            if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
+            $img_url = $this->_convert_gif_to_png($img_url);
+            $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          }
+          break;
+
+        default:
+          //debugpng
+          if (DEBUGPNG) print '!!!unknown!!!';
+          break;
     }
     
     return;
@@ -833,18 +833,18 @@ 
 
         switch ($_t) {
             
-        case "text":
-        $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                            array($page_number, $this->_page_count), $text);
-        $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+            case "text":
+            $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+                                array($page_number, $this->_page_count), $text);
+            $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
+              break;
           
-        case "script":
-          if (!$eval) {
-            $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            case "script":
+              if (!$eval) {
+                $eval = new PHP_Evaluator($this);
+              }
+              $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
+              break;
         }
       }
 

main/inc/lib/phpdocx/pdf/include/list_bullet_renderer.cls.php

Switch Indentation +22 added lines, -22 removed lines

@@ -91,29 +91,29 @@
 
       switch ($bullet_style) {
 
-      default:
-      case "disc":
-        $fill = true;
-
-      case "circle":
-        list($x,$y) = $frame->get_position();
-        $r = ($font_size*(List_Bullet_Frame_Decorator::BULLET_SIZE /*-List_Bullet_Frame_Decorator::BULLET_THICKNESS*/ ))/2;
-        $x -= $font_size*(List_Bullet_Frame_Decorator::BULLET_SIZE/2);
-        $y += ($font_size*(1-List_Bullet_Frame_Decorator::BULLET_DESCENT))/2;
-        $o = $font_size*List_Bullet_Frame_Decorator::BULLET_THICKNESS;
-        $this->_canvas->circle($x, $y, $r, $style->color, $o, null, $fill);
-        break;
-
-      case "square":
-        list($x, $y) = $frame->get_position();
-        $w = $font_size*List_Bullet_Frame_Decorator::BULLET_SIZE;
-        $x -= $w;
-        $y += ($font_size*(1-List_Bullet_Frame_Decorator::BULLET_DESCENT-List_Bullet_Frame_Decorator::BULLET_SIZE))/2;
-        $this->_canvas->filled_rectangle($x, $y, $w, $w, $style->color);
-        break;
+          default:
+          case "disc":
+            $fill = true;
+
+          case "circle":
+            list($x,$y) = $frame->get_position();
+            $r = ($font_size*(List_Bullet_Frame_Decorator::BULLET_SIZE /*-List_Bullet_Frame_Decorator::BULLET_THICKNESS*/ ))/2;
+            $x -= $font_size*(List_Bullet_Frame_Decorator::BULLET_SIZE/2);
+            $y += ($font_size*(1-List_Bullet_Frame_Decorator::BULLET_DESCENT))/2;
+            $o = $font_size*List_Bullet_Frame_Decorator::BULLET_THICKNESS;
+            $this->_canvas->circle($x, $y, $r, $style->color, $o, null, $fill);
+            break;
+
+          case "square":
+            list($x, $y) = $frame->get_position();
+            $w = $font_size*List_Bullet_Frame_Decorator::BULLET_SIZE;
+            $x -= $w;
+            $y += ($font_size*(1-List_Bullet_Frame_Decorator::BULLET_DESCENT-List_Bullet_Frame_Decorator::BULLET_SIZE))/2;
+            $this->_canvas->filled_rectangle($x, $y, $w, $w, $style->color);
+            break;
       
-      case "none":
-        break;
+          case "none":
+            break;
 
       }
     }