kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/nkf: merge nkf 2.1.3 2a2f2c5.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-11-22 05:16:54 +00:00
parent cf0efb8327
commit e103366645
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Nov 22 14:03:00 2013 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf: merge nkf 2.1.3 2a2f2c5.
Fri Nov 22 12:43:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (ruby_strtod): ignore too long fraction part, which does not

12
ext/nkf/nkf-utf8/nkf.c
View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 1987, Fujitsu LTD. (Itaru ICHIKAWA).
* Copyright (c) 1996-2010, The nkf Project.
* Copyright (c) 1996-2013, The nkf Project.
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@ -21,10 +21,10 @@
* 3. This notice may not be removed or altered from any source distribution.
*/
#define NKF_VERSION "2.1.3"
#define NKF_RELEASE_DATE "2012-11-22"
#define NKF_RELEASE_DATE "2013-11-22"
#define COPY_RIGHT \
"Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
"Copyright (C) 1996-2012, The nkf Project."
"Copyright (C) 1996-2013, The nkf Project."
#include "config.h"
#include "nkf.h"
@ -6150,9 +6150,10 @@ kanji_convert(FILE *f)
}
}
else {
i_ungetc(c1,f);
/* lonely ESC */
(*oconv)(0, ESC);
SEND;
SKIP;
}
} else if (c1 == ESC && iconv == s_iconv) {
/* ESC in Shift_JIS */
@ -6189,9 +6190,10 @@ kanji_convert(FILE *f)
}
}
else {
i_ungetc(c1,f);
/* lonely ESC */
(*oconv)(0, ESC);
SEND;
SKIP;
}
} else if (c1 == LF || c1 == CR) {
if (broken_f&4) {

4
ext/nkf/nkf-utf8/nkf.h
View file

@ -1,7 +1,7 @@
/*
*
*
* nkf.h - Header file for nkf
*
*
*/
#ifndef NKF_H

1
ext/nkf/nkf-utf8/utf8tbl.c
View file

@ -1,7 +1,6 @@
/*
* utf8tbl.c - Convertion Table for nkf
*
* $Id$
*/
#include "config.h"

1
ext/nkf/nkf-utf8/utf8tbl.h
View file

@ -1,7 +1,6 @@
/*
* utf8tbl.h - Header file for Convertion Table
*
* $Id: utf8tbl.h,v 1.3 2008/01/23 09:10:25 naruse Exp $
*/
#ifndef _UTF8TBL_H_