enc_htmlbrtab: don't double spaces

[wfpl.git] / encode.php

diff --git a/encode.php b/encode.php
index c09de2a..fd282b7 100644 (file)
--- a/encode.php
+++ b/encode.php
@@ -74,7 +74,7 @@ function enc_htmlbr($str) {
 # Example: <p>~foo htmlbrtab~</p>
 function enc_htmlbrtab($str) {
        $str = enc_htmlbr($str);
-       $whitespace_to_nbsp = create_function('$matches', '$count = 0; $chars = str_split($matches[0]); foreach ($chars as $c) { if ($c == " ") { $count += 2; } else if ($c == "\t") { $count += 8; } } return str_repeat("&nbsp;", $count);');
+       $whitespace_to_nbsp = create_function('$matches', '$count = 0; $chars = str_split($matches[0]); foreach ($chars as $c) { if ($c == " ") { $count += 1; } else if ($c == "\t") { $count += 8; } } return str_repeat("&nbsp;", $count);');
        $str = preg_replace_callback("|^[ \t]+|m", $whitespace_to_nbsp, $str);
        return $str;
 }
@@ -444,12 +444,12 @@ function wfpl_nth_word($str, $n) {
 
 # encoding is a space separated list of:
 # image_filename width height thumb_filename thumb_width thumb_height
-function enc_image_src($str) { wfpl_nth_word($str, 0); }
-function enc_image_width($str) { wfpl_nth_word($str, 1); }
-function enc_image_height($str) { wfpl_nth_word($str, 2); }
-function enc_thumb_src($str) { wfpl_nth_word($str, 3); }
-function enc_thumb_width($str) { wfpl_nth_word($str, 4); }
-function enc_thumb_height($str) { wfpl_nth_word($str, 5); }
+function enc_image_src($str) { return wfpl_nth_word($str, 0); }
+function enc_image_width($str) { return wfpl_nth_word($str, 1); }
+function enc_image_height($str) { return wfpl_nth_word($str, 2); }
+function enc_thumb_src($str) { return wfpl_nth_word($str, 3); }
+function enc_thumb_width($str) { return wfpl_nth_word($str, 4); }
+function enc_thumb_height($str) { return wfpl_nth_word($str, 5); }
 
 # example template: Length: ~length html~ day~length s~
 function enc_s($str) {