diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-04-01 15:54:05 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-04-01 15:54:05 +0000 |
| commit | 12801275a8488afe61b9d14353d1a16ca5329463 (patch) | |
| tree | b0d31069813acadb28204cb55deea2cc3ece303b | |
| parent | e35e04de8e615d9b1bcb0e7bc72012fdd18def7e (diff) | |
| download | redmine-12801275a8488afe61b9d14353d1a16ca5329463.tar.gz redmine-12801275a8488afe61b9d14353d1a16ca5329463.zip | |
Merged r5281 from trunk.
r5256 in trunk and r5271 in 1.1-stable fixed #7794 completely.
r5253 (r5183) in trunk and r5184 effect the width of the ASCII character of Japanese PDF.
Contributed by Jun NAITOH.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5282 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | vendor/plugins/rfpdf/lib/rfpdf/japanese.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/plugins/rfpdf/lib/rfpdf/japanese.rb b/vendor/plugins/rfpdf/lib/rfpdf/japanese.rb index 3f834295b..40f75232d 100644 --- a/vendor/plugins/rfpdf/lib/rfpdf/japanese.rb +++ b/vendor/plugins/rfpdf/lib/rfpdf/japanese.rb @@ -36,7 +36,7 @@ # module. module PDF_Japanese - CONTROL_CHARACTERS = (0x00...0x20).inject({}){|map, c| map[c.chr] = 278; map }.freeze + SJIS_widths={' ' => 278, '!' => 299, '"' => 353, '#' => 614, '$' => 614, '%' => 721, '&' => 735, '\'' => 216, '(' => 323, ')' => 323, '*' => 449, '+' => 529, ',' => 219, '-' => 306, '.' => 219, '/' => 453, '0' => 614, '1' => 614, '2' => 614, '3' => 614, '4' => 614, '5' => 614, '6' => 614, '7' => 614, '8' => 614, '9' => 614, ':' => 219, ';' => 219, @@ -46,7 +46,7 @@ module PDF_Japanese 'Z' => 578, '[' => 316, '\\' => 614, ']' => 316, '^' => 529, '_' => 500, '`' => 387, 'a' => 509, 'b' => 566, 'c' => 478, 'd' => 565, 'e' => 503, 'f' => 337, 'g' => 549, 'h' => 580, 'i' => 275, 'j' => 266, 'k' => 544, 'l' => 276, 'm' => 854, 'n' => 579, 'o' => 550, 'p' => 578, 'q' => 566, 'r' => 410, 's' => 444, 't' => 340, 'u' => 575, 'v' => 512, 'w' => 760, - 'x' => 503, 'y' => 529, 'z' => 453, '{' => 326, '|' => 380, '}' => 326, '~' => 387}.merge(CONTROL_CHARACTERS).freeze + 'x' => 503, 'y' => 529, 'z' => 453, '{' => 326, '|' => 380, '}' => 326, '~' => 387} def AddCIDFont(family,style,name,cw,cMap,registry) fontkey=family.downcase+style.upcase |