Commit 13eca403 authored by ChangZhuo Chen's avatar ChangZhuo Chen

New upstream version 2.0.92

parent 0388ff31
This diff is collapsed.
version 2.0.92
* reduce memory consumption after imported user dictionary;
version 2.0.91
* merge libzhuyin code;
version 2.0.0
* the first official release of 2.0.x;
* fixes autoconf;
version 1.9.92
* fixes crash in double pinyin;
version 1.9.91
* multiple sentence candidates;
version 1.7.0
* fixes build on FreeBSD;
* update cmake files;
version 1.6.91
* change license to GPLv3+;
* import open-gram dictionary and remove pinyin tones;
* add some checks when load data from file;
version 1.6.0
* bug fixes.
version 1.5.91
* change pinyin/phrase tables to use dbm.
* enhance pinyin key representation and pinyin parsers.
version 1.2.0
* bug fixes.
......
## Makefile.am -- Process this file with automake to produce Makefile.in
## Copyright (C) 2007 Peng Wu
##
## This program is free software; you can redistribute it and/or modify
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2, or (at your option)
## any later version.
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -12,8 +12,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
## along with this program. If not, see <http://www.gnu.org/licenses/>.
EXTRA_DIST = COPYING
......@@ -24,7 +23,11 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak
ACLOCAL = aclocal -I .
ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpinyin.pc
if ENABLE_LIBZHUYIN
pkgconfig_DATA += libzhuyin.pc
endif
......@@ -88,9 +88,13 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@ENABLE_LIBZHUYIN_TRUE@am__append_1 = libzhuyin.pc
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
......@@ -99,7 +103,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = libpinyin.pc libpinyin.spec
CONFIG_CLEAN_FILES = libpinyin.pc libzhuyin.pc libpinyin.spec
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -188,9 +192,10 @@ CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libpinyin.pc.in $(srcdir)/libpinyin.spec.in AUTHORS \
COPYING ChangeLog INSTALL NEWS README compile config.guess \
config.sub install-sh ltmain.sh missing
$(srcdir)/libpinyin.pc.in $(srcdir)/libpinyin.spec.in \
$(srcdir)/libzhuyin.pc.in AUTHORS COPYING ChangeLog INSTALL \
NEWS README compile config.guess config.sub install-sh \
ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -233,7 +238,7 @@ distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = aclocal -I .
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
......@@ -265,6 +270,7 @@ FGREP = @FGREP@
GLIB2_CFLAGS = @GLIB2_CFLAGS@
GLIB2_LIBS = @GLIB2_LIBS@
GREP = @GREP@
HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......@@ -369,8 +375,9 @@ AUTOMAKE_OPTIONS = gnu
SUBDIRS = src tests utils data doc
MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak
ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpinyin.pc
pkgconfig_DATA = libpinyin.pc $(am__append_1)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......@@ -425,6 +432,8 @@ distclean-hdr:
-rm -f config.h stamp-h1
libpinyin.pc: $(top_builddir)/config.status $(srcdir)/libpinyin.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libzhuyin.pc: $(top_builddir)/config.status $(srcdir)/libzhuyin.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libpinyin.spec: $(top_builddir)/config.status $(srcdir)/libpinyin.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
......@@ -629,7 +638,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -655,7 +664,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -673,7 +682,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -683,7 +692,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
This diff is collapsed.
......@@ -3,6 +3,9 @@
/* Have Berkeley DB. */
#undef HAVE_BERKELEY_DB
/* define if the compiler supports basic C++11 syntax */
#undef HAVE_CXX11
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
......
This diff is collapsed.
......@@ -4,13 +4,13 @@
# if not 1, append datestamp to the version number.
m4_define([libpinyin_released], [1])
m4_define([libpinyin_major_version], [1])
m4_define([libpinyin_minor_version], [3])
m4_define([libpinyin_micro_version], [0])
m4_define([libpinyin_major_version], [2])
m4_define([libpinyin_minor_version], [0])
m4_define([libpinyin_micro_version], [92])
m4_define(libpinyin_maybe_datestamp,
m4_esyscmd([if test x]libpinyin_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
m4_define([libpinyin_abi_current], [7])
m4_define([libpinyin_abi_current], [12])
m4_define([libpinyin_abi_revision], [0])
m4_define([libpinyin_version],
......@@ -22,8 +22,10 @@ m4_define([libpinyin_binary_version],
AC_PREREQ(2.60)
AC_INIT([libpinyin], [libpinyin_version], [https://github.com/libpinyin/libpinyin/issues/new])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
# Define a string for binary compatibility
......@@ -45,6 +47,8 @@ AC_PROG_MAKE_SET
AC_GNU_SOURCE
AX_CXX_COMPILE_STDCXX([11])
# Init libtool
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
......@@ -99,29 +103,40 @@ AM_CONDITIONAL([BERKELEYDB], [test x"$DBM" = x"BerkeleyDB"])
if test x"$DBM" = x"KyotoCabinet"; then
# Check Kyoto Cabinet
PKG_CHECK_MODULES(KYOTOCABINET, [
kyotocabinet
], [])
PKG_CHECK_MODULES(KYOTOCABINET, [kyotocabinet], [])
AC_SEARCH_LIBS([kcdbopen], [kyotocabinet], [], AC_MSG_ERROR([Cannot find Kyoto Cabinet library]))
AC_DEFINE([HAVE_KYOTO_CABINET], [], [Have Kyoto Cabinet.])
fi
AM_CONDITIONAL([KYOTOCABINET], [test x"$DBM" = x"KyotoCabinet"])
# --enable-libzhuyin
AC_ARG_ENABLE(libzhuyin,
AC_HELP_STRING([--enable-libzhuyin],
[Support libzhuyin library.]),
[enable_libzhuyin=$enableval],
[enable_libzhuyin=no]
)
AM_CONDITIONAL(ENABLE_LIBZHUYIN, test x"$enable_libzhuyin" = x"yes")
AC_CONFIG_FILES([libpinyin.pc
libzhuyin.pc
libpinyin.spec
Makefile
Makefile
doc/Makefile
data/Makefile
src/Makefile
data/Makefile
src/Makefile
src/include/Makefile
src/storage/Makefile
src/lookup/Makefile
tests/Makefile
src/lookup/Makefile
tests/Makefile
tests/include/Makefile
tests/storage/Makefile
tests/lookup/Makefile
utils/Makefile
tests/lookup/Makefile
utils/Makefile
utils/storage/Makefile
utils/segment/Makefile
utils/training/Makefile
......@@ -134,4 +149,5 @@ Build options:
Version $VERSION
Install prefix $prefix
DBM $DBM
Enable libzhuyin $enable_libzhuyin
])
## Makefile.am -- Process this file with automake to produce Makefile.in
## Copyright (C) 2011 Peng Wu
##
## This program is free software; you can redistribute it and/or modify
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2, or (at your option)
## any later version.
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -12,12 +12,11 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
## along with this program. If not, see <http://www.gnu.org/licenses/>.
tablefiles = gb_char.table gbk_char.table \
merged.table \
opengram.table merged.table \
art.table culture.table economy.table \
geology.table history.table life.table \
nature.table people.table science.table \
......@@ -49,8 +48,8 @@ libpinyin_dbdir = $(libdir)/libpinyin/data
CLEANFILES = $(binary_model_data)
interpolation2.text:
wget http://downloads.sourceforge.net/libpinyin/models/model11.text.tar.gz
tar xvf model11.text.tar.gz -C $(top_srcdir)/data
wget http://downloads.sourceforge.net/libpinyin/models/model14.text.tar.gz
tar xvf model14.text.tar.gz -C $(top_srcdir)/data
$(tablefiles) table.conf: interpolation2.text
......
......@@ -90,7 +90,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = data
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
......@@ -181,6 +184,7 @@ FGREP = @FGREP@
GLIB2_CFLAGS = @GLIB2_CFLAGS@
GLIB2_LIBS = @GLIB2_LIBS@
GREP = @GREP@
HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......@@ -281,7 +285,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
tablefiles = gb_char.table gbk_char.table \
merged.table \
opengram.table merged.table \
art.table culture.table economy.table \
geology.table history.table life.table \
nature.table people.table science.table \
......@@ -525,8 +529,8 @@ uninstall-am: uninstall-libpinyin_dbDATA
interpolation2.text:
wget http://downloads.sourceforge.net/libpinyin/models/model11.text.tar.gz
tar xvf model11.text.tar.gz -C $(top_srcdir)/data
wget http://downloads.sourceforge.net/libpinyin/models/model14.text.tar.gz
tar xvf model14.text.tar.gz -C $(top_srcdir)/data
$(tablefiles) table.conf: interpolation2.text
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
binary format version:3
model data version:11
lambda parameter:0.262289
binary format version:5
model data version:12
lambda parameter:0.205966
source table format:pinyin
default RESERVED NULL NULL NULL NOT_USED
default GB_DICTIONARY gb_char.table gb_char.bin gb_char.dbin SYSTEM_FILE
default GBK_DICTIONARY gbk_char.table gbk_char.bin gbk_char.dbin SYSTEM_FILE
default OPENGRAM_DICTIONARY opengram.table opengram.bin opengram.dbin SYSTEM_FILE
default MERGED_DICTIONARY merged.table merged.bin merged.dbin SYSTEM_FILE
default ADDON_DICTIONARY NULL NULL addon.bin USER_FILE
default NETWORK_DICTIONARY NULL NULL network.bin USER_FILE
......
This diff is collapsed.
## Makefile.am -- Process this file with automake to produce Makefile.in
## Copyright (C) 2007 Peng Wu
##
## This program is free software; you can redistribute it and/or modify
## This program is free software: you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2, or (at your option)
## any later version.
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -12,8 +12,7 @@
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program; if not, write to the Free Software
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
## along with this program. If not, see <http://www.gnu.org/licenses/>.
man_MANS = libpinyin.1
......
......@@ -89,7 +89,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
......@@ -182,6 +185,7 @@ FGREP = @FGREP@
GLIB2_CFLAGS = @GLIB2_CFLAGS@
GLIB2_LIBS = @GLIB2_LIBS@
GREP = @GREP@
HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
libzhuyinincludedir=${includedir}/libpinyin-@VERSION@
libzhuyin_binary_version=@LIBPINYIN_BINARY_VERSION@
Name: libzhuyin
Description: Library to deal with zhuyin
Version: @VERSION@
Requires: glib-2.0
Libs: -L${libdir} -lzhuyin
Cflags: -I${libzhuyinincludedir}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# @configure_input@
# serial 4179 ltversion.m4
# This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.4.6])
m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.4.6'
macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -41,5 +41,8 @@ namespace std_lite{
using std::pop_heap;
using std::push_heap;
}
#endif
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.