head 1.3; access; symbols pkgsrc-2014Q1:1.2.0.88 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.86 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.84 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.82 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.80 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.78 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.76 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.74 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.72 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.70 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.68 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.66 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.64 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.62 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.60 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.58 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.56 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.54 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.52 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.50 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.48 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.46 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.44 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.42 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.40 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.38 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1; locks; strict; comment @# @; 1.3 date 2014.06.06.12.09.47; author obache; state dead; branches; next 1.2; commitid fVKX0fx9UUzzrsDx; 1.2 date 2003.10.20.22.24.34; author kristerw; state Exp; branches; next 1.1; 1.1 date 2002.10.06.14.51.28; author taca; state Exp; branches; next ; desc @@ 1.3 log @Update KAKASI to 2.3.6. (in addtion to backported patches, dropped prototype patch of kakasi_do(). Its committer doesn't know the reason anymore, and implemented part patches had been merged long time ago with "patch-aa and patch-ac patched the same file. Merge them" but patch-aa was for lib/libkakasi.c, and patch-ac is for src/kakasi.c. From no problem reportes, it is considered this patch set is not relevant). Changes from KAKASI 2.3.5 to 2.3.6 * Check runtime environment for test codes, and skip impossible tests. * With configure, check compiler supported option. (for the issue old gcc cannot accept -Wno-unused-result option) * Fixed to check iconv availability at configure instead of autconf. * Fixed and added manual (by Osamu Aoki). * Fixed a bug to ouput redundant delimiter at wakatigaki if the line start with ASCII character. * Changed unitptr_t from macro to typedef (to avoid the issue that come compilers cannot handle such macro) * Fixed missing iconv related casts. Changes from KAKASI 2.3.4 to 2.3.5 * Added UTF-8 input/output support (iconv is required) * Improve handling of japanese long-vowel. * Fixed bug of do_kakasi(), may return invald memory area. * Fixed a wrong entriy in kakasidict. * Fixed bad hepburn romaji table. * Added use_old_romaji_table variable and -t option. * Fixed segfault on invalid SS2 sequences. * Fixes warnings at compile. * Added a test script. * Added -S option for mutable separator (with -w or -s option). * Added -l and -L option for level furigana and hiragana conversion. (See doc/README.level for more information) * Newly added -F option for mutable parentheses around furigana (with -JH -f or -L option). * Added -y option to display all yomi per one Kanji. * Add endian independent dictionary format support. * Fixed bad hepburn romaji table. (specify -t option fo use old romaji table) @ text @$NetBSD: patch-ac,v 1.2 2003/10/20 22:24:34 kristerw Exp $ --- src/kakasi.c.orig Sun Sep 2 13:43:21 2001 +++ src/kakasi.c Tue Oct 21 00:11:03 2003 @@@@ -41,6 +41,9 @@@@ #ifdef HAVE_MALLOC_H # include #endif +#ifdef HAVE_STRING_H +# include +#endif #include #include "kakasi.h" #ifdef LIBRARY @@@@ -105,6 +108,12 @@@@ static int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void))); static void digest_shift PARAMS((Character *c, int s)); #else /* LIBRARY */ +void digest_start_copy PARAMS((Character *c, Character *r)); +void put_separator PARAMS((void)); +void putchars PARAMS((Character *results)); +void digest_out PARAMS((Character *c, int ret)); +int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void))); +void digest_shift PARAMS((Character *c, int s)); static void free_jisyo PARAMS((void)); #endif /* LIBRARY */ @@@@ -497,7 +506,7 @@@@ char * kakasi_do(str) - char *str; + unsigned char *str; { Character c[KAKASIBUF], r[KAKASIBUF]; int clen, ptype, pctype; @@@@ -559,7 +568,13 @@@@ } else if (c[0].c1 == 0xa5) { ptype = 5; } else if ((c[0].c1 == 0xa1) && (c[0].c2 == 0xbc)) { + if (pctype == 5) { ptype = 5; + } else if (pctype == 6) { + ptype = 6; + } else { + ptype = 5; + } } else { ptype = 4; } @@@@ -604,7 +619,7 @@@@ { char *ret = getpbstr(); if (ret == NULL) - return ""; + return strdup(""); return ret; } #endif @ 1.2 log @patch-aa and patch-ac patched the same file. Merge them. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Add some fix to src/kakasi.c: kakasi_do(). from http://cvs.namazu.org/kakasi/src/kakasi.c. 1.20 -> 1.21 a long vowel processing improvement http://www.namazu.org/ml/namazu-users-ja/msg02377.html 1.21 -> 1.22 return value consistency; always returns pointer allocated by malloc(3) Bump to kakasi-2.3.4nb1. @ text @d3 2 a4 2 --- src/kakasi.c.orig Sun Sep 2 20:43:21 2001 +++ src/kakasi.c d15 23 a37 1 @@@@ -559,7 +562,13 @@@@ kakasi_do(str) d42 1 a42 1 + ptype = 5; d46 1 a46 1 ptype = 5; d51 1 a51 1 @@@@ -604,7 +613,7 @@@@ kakasi_do(str) @