Commit graph

72 commits

Author SHA1 Message Date
naruse
7fe3c2665e * ext/nkf/nkf-utf8/nkf.c: Merge nkf 2.1.4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-12 14:01:56 +00:00
nobu
ed316bcfad nkf.c: add semicolon
* ext/nkf/nkf-utf8/nkf.c (nkf_iconv_t): fix a missing semicolon.
  reported by Denis Denisov <denji0k AT gmail.com>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-26 06:09:31 +00:00
nobu
28b9f11d5a protoize no-arguments functions
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-30 05:25:32 +00:00
hsbt
d1ab866d4a * ext/nkf/nkf-utf8/nkf.c: fix typo by @windwiny [fix GH-506]
* ext/openssl/ossl_ssl.c: ditto
* ext/psych/yaml/scanner.c: ditto
* ext/socket/init.c: ditto
* ext/socket/socket.c: ditto
* ext/tk/tcltklib.c: ditto
* ext/win32ole/win32ole.c: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-19 05:43:23 +00:00
naruse
e103366645 * ext/nkf: merge nkf 2.1.3 2a2f2c5.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-22 05:16:54 +00:00
naruse
e6c2ffa981 * ext/nkf/nkf-utf8/nkf.c (unicode_iconv_combine): returning flags are
nkf_char.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-24 12:09:39 +00:00
naruse
59c41661a7 * ext/nkf/nkf-utf8: Merge b0a6577a521d1bba5e19853f95d5c4b9be1072b5.
Support JIS X 0213 and some bugfixes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-22 08:47:30 +00:00
naruse
3d42b23557 * ext/nkf/nkf-utf8/nkf.c: Merge upstream: 50a383c84.
[ruby-dev:46128] [Bug #7005]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-14 17:26:39 +00:00
naruse
05558e04b8 * ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
Bump version number/release date only.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-08 12:17:06 +00:00
naruse
e3532c8bde Revert "Change encoding from ISO-2022 to UTF-8"
This reverts commit r33213.
Don't change nkf which is imported from upstream.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-07 22:17:55 +00:00
ayumin
9f4dd65e89 Change encoding from ISO-2022 to UTF-8
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-07 17:56:24 +00:00
nobu
3a47cf3395 * remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-15 11:55:52 +00:00
naruse
e3c3733a30 * ext/nkf/nkf-utf8/nkf.c: import nkf 7f18e30.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-03-25 06:46:55 +00:00
naruse
f795d0f418 * ext/nkf/nkf-utf8/nkf.c: Fix type of mimeout_state.buf.
[nkf-bug:20079]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-08-09 05:11:04 +00:00
naruse
2a0c12cce4 * ext/nkf/nkf-utf8/nkf.c: updated to b856dd07.
this cleans warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-30 09:48:28 +00:00
naruse
9526ba4ef3 * ext/nkf/nkf-utf8/nkf.c: Update nkf 2010-04-28.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-03 19:04:29 +00:00
nobu
977267c2e0 * ext/**/*.[ch]: removed trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-22 08:04:13 +00:00
naruse
b2ae252976 * ext/nkf/nkf-utf8/nkf.c: Refix [nkf-bug:21393]. (explicit -X)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-14 01:55:17 +00:00
naruse
4392ea3527 * ext/nkf/nkf-utf8/nkf.c: Fix: Windows Codepages wrongly convert
Halfwidth Katakana. [nkf-bug:21393]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-13 11:37:55 +00:00
naruse
e03b66ef18 * ext/nkf/nkf-utf8/nkf.c: import latest nkf. [master 9306cb0]
this also fixes [ruby-dev:40607]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-03-15 01:37:45 +00:00
naruse
3c13fd9be0 * ext/nkf/nkf-utf8/nkf.c (nkf_buf): use nkf_char.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-20 08:59:06 +00:00
usa
2ad3120ea6 * ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
* ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-20 00:27:17 +00:00
naruse
13313688b2 * ext/nkf/nkf-utf8/nkf.c: Update nkf to 2.0.9.
revert -s meaning as Shift_JIS, etc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-19 18:52:42 +00:00
naruse
10ddffb278 * nkf.c: update to r1.188. fixes for 16bit environment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-11-07 02:59:38 +00:00
naruse
b87182fa7f * ext/nkf/nkf-utf8/nkf.c (kanji_convert): output unicode chars.
[ruby-dev:36957]

* ext/nkf/nkf-utf8/nkf.c (numchar_getc): increase buffer size.
  reported and patched at [ruby-dev:36957] by mame.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-28 14:30:17 +00:00
nobu
c3fda337a0 * ext/nkf/nkf-utf8/nkf.c: commit miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-29 15:51:35 +00:00
nobu
b921425c49 * ext/nkf/nkf-utf8/nkf.c: constified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-29 15:47:46 +00:00
naruse
a9cc553e61 * ext/nkf/nkf-utf8/nkf.c: fix memory violation. mentioned by mame [ruby-dev:36373]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-18 18:42:47 +00:00
nobu
e35550c3e7 * ext/nkf/nkf-utf8/nkf.c (struct input_code.name, input_codename):
constified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-07-22 18:19:34 +00:00
naruse
ec18fc70a3 * ext/nkf/nkf-utf8/nkf.c (options): use input_endian.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-07-09 00:50:37 +00:00
naruse
404de438af * ext/nkf/nkf-utf8/nkf.c (nkf_str_caseeql): added.
* ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index): use nkf_str_caseeql.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-21 21:23:51 +00:00
naruse
5dd3a0e2dd * ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index):
use strcasecmp. [ruby-dev:34787]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-21 08:48:10 +00:00
naruse
5eb4d70c5f * ext/nkf/nkf-utf8/nkf.c (rb_nkf_convert) (nkf_enc_without_bom):
reverted. nkf-utf8/nkf.c should be independent of ruby.

* ext/nkf/nkf.c (options):
  moved from nkf-utf8/nkf.c. 
  override nkf's original settings for Unicode BOM.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-20 13:10:28 +00:00
nobu
7992fabaf4 * ext/nkf/nkf.c (rb_nkf_convert), ext/nkf/nkf-utf8/nkf.c
(nkf_enc_without_bom): BOM is not a part of encodings.

* ext/nkf/nkf.c (Init_nkf), ext/nkf/nkf-utf8/nkf.c (options):
  UTF-{16,32} without endian have no sense.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-20 04:20:53 +00:00
naruse
0beaddc4e2 * ext/nkf/nkf-utf8/nkf.c (score_table_A0, score_table_F0):
type of content is unsigned char.

* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): 'c' is nkf_char.

* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): enc is 0 or pointer.

* ext/nkf//nkf.c (options): type of option is unsigned char.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-04-22 12:20:36 +00:00
naruse
17123b2958 * ext/nkf/nkf-utf8/nkf.c (z_conv): characters must be nkf_char.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-04-22 11:54:50 +00:00
matz
5a8d5c873b * ext/nkf/nkf-utf8/nkf.c (nkf_enc_from_index): BINARY does not
have in-bound encoding index.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-02-07 00:06:55 +00:00
naruse
4aa64b35fa * ext/nkf/nkf.c: raise error when no output encoding is given.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-27 08:55:31 +00:00
naruse
086e5b1a63 * ext/nkf/nkt-utf8: update nkf.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-27 07:28:26 +00:00
naruse
353a69229d * ext/nkf/nkf-utf8/nkf.c: fix bug: -m was -m0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-11 19:33:37 +00:00
naruse
249c08716d * ext/nkf/nkf-utf8/nkf.c: update to r1.163.
* ext/nkf/nkf.c: ASCII's canonical name is US-ASCII.

* ext/nkf/lib/kconv.rb (Kconv.isjis): force_encoding('BINARY').


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-11 01:03:23 +00:00
naruse
7d847f7c37 * ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: Update nkf.
* ext/nkf/nkf.c: fix documents.

* ext/nkf/lib/kconv.rb: fix documents.
  (Kconv.is*): use valid_encoding?.
  (Kconv.isjis): defined.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-01 15:22:25 +00:00
naruse
03a1e25542 * ext/nkf/nkf.c (rb_nkf_enc_get): use rb_define_dummy_encoding.
* ext/nkf/nkf.c (Init_nkf): use rb_nkf_enc_get("ASCII").

* ext/nkf/nkf-utf8/nkf.c: Update 1.161.

* ext/nkf/nkf-utf9/config.h: default output encoding is now UTF-8.

* ext/nkf/lib/kconv.rb (Kconv.kconv): replace Encoding#name by
  Encoding#to_s.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-12-23 09:37:51 +00:00
naruse
573bd7500b * ext/nkf/nkf-utf8.c: Update nkf.c rev:1.157.
* ext/nkf/nkf.c (rb_nkf_enc_get): replicate proper based encoding.

* ext/nkf/kconv.c (Kconv#kconv, to*): use self.encoding as from_enc
  when from_enc isn't given.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-12-22 08:36:30 +00:00
naruse
dec6ba8a22 * ext/nkf/nkf-utf8/nkf.c: Updated.
* ext/nkf/nkf.c (rb_nkf_enc_get): added.
  (find encoding or replicate default encoding)

* ext/nkf/nkf.c (NKF::<ENCODING>): redefine encoding constant.

* ext/nkf/lib/kconv.rb (Kconv::<ENCODING>): redefined as Encoding.

* ext/nkf/lib/kconv.rb: refactoring.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-12-19 10:19:38 +00:00
naruse
0cf4378f14 * ext/nkf/nkf.c (NKF::_ENCODING): removed.
* ext/nkf/nkf.c (rb_nkf_kconv): renamed to rb_nkf_convert.

* ext/nkf/nkf.c (rb_nkf_convert): set encoding.

* ext/nkf/nkf.c (rb_nkf_guess1): removed.

* ext/nkf/nkf.c (rb_nkf_guess2): renamed to rb_nkf_guess.

* ext/nkf/nkf.c (rb_nkf_guess):
  guess method now returns encoding object.

* ext/nkf/nkf-utf8/nkf.c: Update to nkf 2.0.8 2007-12-19.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-12-19 04:29:22 +00:00
naruse
3c17590061 * ext/nkf/nkf-utf8/nkf.c (kanji_convert): Fix guess fallback.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-05 05:11:04 +00:00
naruse
af1c416728 * lib/json.rb, lib/json, ext/json, test/json:
import JSON library.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12428 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-04 12:31:26 +00:00
naruse
47dae86617 * ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}:
imported nkf 2007-01-28.
  * Fixed: can't decode MIME encode JIS string.
  * Fixed: Fullwitdh-halfwidth conversion.
  * Support DoCoMo's and Softbank's EMOJI
  * Support CP932, CP5022x, eucJP-ms UDC
  * Support UTF-32 encoding
  * Support beyond BMP
  [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 15:08:59 +00:00
naruse
5300eecfb3 * ext/nkf/nkf-8/nkf.c: imported nkf 2.0.8 rev.110.
* Fix: check_bom cuts \xfe\xff\xXX\xXX of UTF-32.
  * Add support --ic=UTF-32.
  * Fix: can't guess UTF-16 and UTF-32.
  * Fix: can't decode beyond BMP of UTF-16LE.

* ext/nkf/nkf.c (guess): Support UTF-32.

* ext/nkf/lib/kconv.rb (kconv): Support UTF-32.

* ext/nkf/lib/kconv.rb (to_utf32): new method.

* ext/nkf/lib/kconv.rb (to_utf32): new method.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-09-15 11:26:07 +00:00