chasen-2.4.3-preview3

diff --git a/NEWS b/NEWS
index 7aae424..b696252 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,13 @@ NEWS
 About detail changes after v.2.2.0, see the file ChangeLog.
 
 ----------------------------------------------------------------------
+ChaSen 2.4.3 (2008/05/31)
+----------------------------------------------------------------------
+- bug fix
+  http://sourceforge.jp/tracker/index.php?func=detail&aid=12464&group_id=2619&atid=9708
+  please use darts-0.32 or higher.
+
+----------------------------------------------------------------------
 ChaSen 2.4.2 (2007/07/23)
 ----------------------------------------------------------------------
 - bug fix

diff --git a/configure.in b/configure.in
index a313213..a3c366a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(README)
 AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE(chasen, 2.4.2)
+AM_INIT_AUTOMAKE(chasen, 2.4.3-preview3)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -23,7 +23,6 @@ AC_PROG_MAKE_SET
 LTVERSION="2:4:0"
 AC_SUBST(LTVERSION)
 
-
 dnl Checks for programs.
 AC_ISC_POSIX
 AC_PROG_INSTALL
@@ -35,7 +34,6 @@ AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h])
 AC_CHECK_HEADERS([sys/param.h sys/types.h netinet/in.h])
 AC_CHECK_HEADERS([io.h windows.h])
 
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_OFF_T
@@ -64,8 +62,12 @@ AC_LANG_CPLUSPLUS
 
 AC_CACHE_VAL(cl_cv_header_darts, [
 AC_TRY_COMPILE([#include <darts.h>],[;], [cl_cv_header_darts=yes], [
-    AC_MSG_ERROR(no header of Darts. You need to fetch Darts from http://cl.aist-nara.ac.jp/~taku-ku/software/darts/.)])])
+    AC_MSG_ERROR(no header of Darts. You need to get darts-0.32 or higher from http://chasen.org/~taku/software/darts/.)])])
 AC_MSG_RESULT($cl_cv_header_darts)
+AC_CACHE_VAL(cl_cv_header_darts_version, [
+    AC_EGREP_HEADER([DARTS_VERSION \"0.3[23456789]\"],darts.h,cl_cv_header_darts_version=yes,[AC_MSG_ERROR(an old version of darts.h is found. You need to get darts-0.32 or higher from http://chasen.org/~taku/software/darts/.)])])
+
+AC_MSG_RESULT(checking for darts.h version >= 0.32... $cl_cv_header_darts_version)
 AC_LANG_C
 
 AC_ARG_WITH(libiconv,

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1e4334b..4147a55 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,4 +9,4 @@ SUFFIXES= .tex .dvi .pdf
        platex $<
 
 .dvi.pdf:
-       dvipdf $<
+       dvipdfmx $<

diff --git a/doc/manual-j.pdf b/doc/manual-j.pdf
index 61cb8ca..072416d 100644 (file)
Binary files a/doc/manual-j.pdf and b/doc/manual-j.pdf differ

diff --git a/doc/manual-j.tex b/doc/manual-j.tex
index ff00410..ea59bc1 100644 (file)
--- a/doc/manual-j.tex
+++ b/doc/manual-j.tex
@@ -18,11 +18,11 @@
 
 \title{
 \bf ·ÁÂÖÁDzòÀÏ¥·¥¹¥Æ¥à\\
-  ¡ØÃã䥡Ùversion 2.4.0 \\
+  ¡ØÃã䥡Ùversion 2.4.3 \\
   »ÈÍÑÀâÌÀ½ñ}
 \author{¾¾ËÜ͵¼£ ~ ¹â²¬°ìÇÏ ~ Àõ¸¶Àµ¹¬}
-\date{Ê¿À® 19 ǯ 3 ·î\\
-\rule{0mm}{110mm} Copyright \copyright\ 2007 ÆàÎÉÀèü²Ê³Øµ»½ÑÂç³Ø±¡Âç³Ø ¾ðÊó²Ê³Ø¸¦µæ²Ê ¼«Á³¸À¸ì½èÍý³Ø¹ÖºÂ} 
+\date{Ê¿À® 20 ǯ 5 ·î\\
+\rule{0mm}{110mm} Copyright \copyright\ 2008 ÆàÎÉÀèü²Ê³Øµ»½ÑÂç³Ø±¡Âç³Ø ¾ðÊó²Ê³Ø¸¦µæ²Ê ¼«Á³¸À¸ì½èÍý³Ø¹ÖºÂ} 
 
 \def\|{\verb|}
 \def\*{\verb**}
@@ -43,7 +43,7 @@ Morphological Analysis System ChaSen 2.4.0 Users Manual
 Yuji Matsumoto, Kazuma Takaoka and Masayuki Asahara
 
 \noindent
-Copyright (c) 2007 Nara Institute of Science and Technology
+Copyright (c) 2008 Nara Institute of Science and Technology
 All rights reserved.
 
 \vspace{.5em}
@@ -116,10 +116,16 @@ ChaSen\\
 % ~ ~ version 2.3.2 & 1 August 2003\\
 % ~ ~ version 2.3.3 & 16 August 2003\\
 ~ ~ version 2.4.0 & 30 March 2007\\
+~ ~ version 2.4.1 & 3 July 2007\\
+~ ~ version 2.4.2 & 23 July 2007\\
+~ ~ version 2.4.3 & 30 May 2008\\
 ChaSen for Windows\\
 ~ ~ version 1.0 & 29 March 1997\\
 ~ ~ version 2.0 & 15 December 1999\\
 ~ ~ version 2.4.0 & 30 March 2007\\
+~ ~ version 2.4.1 & 3 July 2007\\
+~ ~ version 2.4.2-1 & 13 October 2007\\
+~ ~ version 2.4.3 & 30 May 2008\\
 NAIST Technical Report\\
 ~ ~ 1st edition(NAIST-IS-TR99008) & 20 April 1999\\
 ~ ~ 2nd edition(NAIST-IS-TR99012) & 15 December 1999\\

diff --git a/lib/dartsdic.cpp b/lib/dartsdic.cpp
index 290b75c..fa7f19c 100644 (file)
--- a/lib/dartsdic.cpp
+++ b/lib/dartsdic.cpp
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: dartsdic.cpp,v 1.3 2007/03/14 04:01:23 masayu-a Exp $
+ * $Id: dartsdic.cpp,v 1.4 2008/05/16 04:59:21 masayu-a Exp $
  */
 
 #include <string>
@@ -196,7 +196,7 @@ da_build_dump(da_build_t* builder, char* tmpfile, FILE* lexfile)
     std::cerr << size << " keys" << std::endl;
 
     DoubleArrayL da;
-    da.build(size, keys, lens, vals);
+    da.build(size, (const char**) keys, lens, vals);
     da.save(builder->path->c_str(), "wb");
 
     return builder->entries->size();