catch numbers higher/lower than available prefixes

Author: PhilippCo

_test/Type_Decimal.test.php

@@ -131,10 +131,15 @@ public function valueProvider()
             array('1e9',  '1'."\xE2\x80\xAF".'G', '-1', ',', ' ', true, '', '', true),
             array('1e12', '1'."\xE2\x80\xAF".'T', '-1', ',', ' ', true, '', '', true),
 
-            array('1e4', '10'."\xE2\x80\xAF".'k', '-1', ',', ' ', true, '', '', true),
+            array('1e4', '10'. "\xE2\x80\xAF".'k', '-1', ',', ' ', true, '', '', true),
             array('1e5', '100'."\xE2\x80\xAF".'k', '-1', ',', ' ', true, '', '', true),
 
-            array('1e15', '100'."\xE2\x80\xAF".'k', '-1', ',', ' ', true, '', '', true),
+            array('1e-4', '100'."\xE2\x80\xAF".'µ', '-1', ',', ' ', true, '', '', true),
+            array('1e-5', '10'. "\xE2\x80\xAF".'µ', '-1', ',', ' ', true, '', '', true),
+            
+            //test behaviour if number exceeds prefix array
+            array('1e15',  '1000'. "\xE2\x80\xAF".'T', '-1', ',', ' ', true, '', '', true),
+            array('1e-21', '0.001'."\xE2\x80\xAF".'a', '-1', ',', ' ', true, '', '', true),
 
         );
     }

types/Decimal.php

@@ -46,14 +46,18 @@ public function renderValue($value, \Doku_Renderer $R, $mode)
 
         if ($exp < 0) {
                 $units = $unitsl;
-                $mul   = -1;
+                $pfkey = -1 * $exp;
         } else {
                 $units = $unitsh;
-                $mul   = 1; 
+                $pfkey = $exp; 
         }
 
+        if (count($units) <= ($pfkey+1)) {
+            $pfkey = sizeof($units)-1;
+            $exp   = $pfkey * $exp/abs($exp);
+        }
 
-        $R->cdata($this->config['prefix'] . $value / 10**($exp*3) . "\xE2\x80\xAF" . $units[$exp*$mul] . $this->config['postfix'] );
+        $R->cdata($this->config['prefix'] . $value / 10**($exp*3) . "\xE2\x80\xAF" . $units[$pfkey] . $this->config['postfix'] );
         return true;
     }