[mbt] 79/80: Imported Upstream version 3.2.10
Joost van Baal
joostvb at moszumanska.debian.org
Wed Sep 3 03:11:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
joostvb pushed a commit to branch master
in repository mbt.
commit 7c7e14a2d4033b0237e1697f4e8760c16ee7b309
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date: Wed Sep 3 02:09:10 2014 +0200
Imported Upstream version 3.2.10
---
ChangeLog | 34 ++++++++++++++++++++++++++++++
NEWS | 5 ++++-
bootstrap | 4 ++--
configure | 56 +++++++++++++++++++++++++-------------------------
configure.ac | 8 ++++----
include/mbt/Logging.h | 4 ++--
include/mbt/MbtAPI.h | 4 ++--
include/mbt/Pattern.h | 4 ++--
include/mbt/Sentence.h | 4 ++--
include/mbt/TagLex.h | 4 ++--
include/mbt/Tagger.h | 4 ++--
mbt.pc | 2 +-
src/Makefile.am | 4 ++--
src/Makefile.in | 4 ++--
src/Mbt.cxx | 4 ++--
src/MbtAPI.cxx | 4 ++--
src/Mbtg.cxx | 4 ++--
src/Pattern.cxx | 4 ++--
src/Sentence.cxx | 4 ++--
src/TagLex.cxx | 13 ++++++------
src/Tagger.cxx | 10 ++++-----
src/convert.cxx | 4 ++--
src/simpletest.cxx | 4 ++--
23 files changed, 114 insertions(+), 78 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 23af5b6..f965673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2013-04-03 12:33 sloot
+
+ * [r15901] NEWS, configure.ac: Some NEWS about ticcutils
+
+2013-04-02 16:06 sloot
+
+ * [r15881] configure.ac: we need the latest and greatest ticcutils
+
+2013-03-28 11:58 sloot
+
+ * [r15830] src/TagLex.cxx: adapted to new ticcutils
+
+2013-02-12 13:01 sloot
+
+ * [r15663] src/TagLex.cxx: somewhat cleaner
+
+2013-01-07 14:47 sloot
+
+ * [r15567] include/mbt/Logging.h, include/mbt/MbtAPI.h,
+ include/mbt/Pattern.h, include/mbt/Sentence.h,
+ include/mbt/TagLex.h, include/mbt/Tagger.h, src/Mbt.cxx,
+ src/MbtAPI.cxx, src/Mbtg.cxx, src/Pattern.cxx, src/Sentence.cxx,
+ src/TagLex.cxx, src/Tagger.cxx, src/convert.cxx,
+ src/simpletest.cxx: bump year
+
+2012-11-13 11:27 sloot
+
+ * [r15421] src/Tagger.cxx: small fix
+
+2012-10-30 12:39 mvgompel
+
+ * [r15363] bootstrap: bootstrap fix (matched failed on automake
+ 1.11.6 with Ubuntu 12.10)
+
2012-10-11 14:04 sloot
* [r15292] NEWS: News for release
diff --git a/NEWS b/NEWS
index f845018..9a7bca8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+mbt version 3.2.10 2013-04-03
+ * even more based on ticcutils
+
mbt version 3.2.9 2012-10-11
* now based on ticcutils
@@ -109,5 +112,5 @@ mbt version 1.0
- shipped as Mbt.1.0.tar.gz
-# $Id: NEWS 15292 2012-10-11 14:04:46Z sloot $
+# $Id: NEWS 15901 2013-04-03 12:33:53Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/NEWS $
diff --git a/bootstrap b/bootstrap
index 946deef..54e3358 100644
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,4 @@
-# $Id: bootstrap 6832 2010-11-11 16:32:39Z sloot $
+# $Id: bootstrap 15363 2012-10-30 12:39:03Z mvgompel $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/bootstrap $
# bootstrap - script to bootstrap the distribution rolling engine
@@ -38,7 +38,7 @@ aclocal=aclocal
# svn log --verbose > ChangeLog
#}
-if $automake --version|head -1 |grep '1\.[4-9]'; then
+if $automake --version|head -1 |grep ' 1\.[4-9]'; then
echo "automake 1.4-1.9 is active. You should use automake 1.10 or later"
if test -f /etc/debian_version; then
echo " sudo apt-get install automake"
diff --git a/configure b/configure
index 452363d..7b66819 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for mbt 3.2.9.
+# Generated by GNU Autoconf 2.68 for mbt 3.2.10.
#
# Report bugs to <timbl at uvt.nl>.
#
@@ -569,8 +569,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mbt'
PACKAGE_TARNAME='mbt'
-PACKAGE_VERSION='3.2.9'
-PACKAGE_STRING='mbt 3.2.9'
+PACKAGE_VERSION='3.2.10'
+PACKAGE_STRING='mbt 3.2.10'
PACKAGE_BUGREPORT='timbl at uvt.nl'
PACKAGE_URL=''
@@ -1318,7 +1318,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mbt 3.2.9 to adapt to many kinds of systems.
+\`configure' configures mbt 3.2.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1388,7 +1388,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mbt 3.2.9:";;
+ short | recursive ) echo "Configuration of mbt 3.2.10:";;
esac
cat <<\_ACEOF
@@ -1510,7 +1510,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mbt configure 3.2.9
+mbt configure 3.2.10
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1963,7 +1963,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mbt $as_me 3.2.9, which was
+It was created by mbt $as_me 3.2.10, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2778,7 +2778,7 @@ fi
# Define the identity of the package.
PACKAGE='mbt'
- VERSION='3.2.9'
+ VERSION='3.2.10'
cat >>confdefs.h <<_ACEOF
@@ -15748,12 +15748,12 @@ if test -n "$timbl_CFLAGS"; then
pkg_cv_timbl_CFLAGS="$timbl_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"timbl >= 6.4.2 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "timbl >= 6.4.2 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"timbl >= 6.4.4 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "timbl >= 6.4.4 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_timbl_CFLAGS=`$PKG_CONFIG --cflags "timbl >= 6.4.2 " 2>/dev/null`
+ pkg_cv_timbl_CFLAGS=`$PKG_CONFIG --cflags "timbl >= 6.4.4 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15765,12 +15765,12 @@ if test -n "$timbl_LIBS"; then
pkg_cv_timbl_LIBS="$timbl_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"timbl >= 6.4.2 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "timbl >= 6.4.2 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"timbl >= 6.4.4 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "timbl >= 6.4.4 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_timbl_LIBS=`$PKG_CONFIG --libs "timbl >= 6.4.2 " 2>/dev/null`
+ pkg_cv_timbl_LIBS=`$PKG_CONFIG --libs "timbl >= 6.4.4 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15791,14 +15791,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- timbl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "timbl >= 6.4.2 " 2>&1`
+ timbl_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "timbl >= 6.4.4 " 2>&1`
else
- timbl_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "timbl >= 6.4.2 " 2>&1`
+ timbl_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "timbl >= 6.4.4 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$timbl_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (timbl >= 6.4.2 ) were not met:
+ as_fn_error $? "Package requirements (timbl >= 6.4.4 ) were not met:
$timbl_PKG_ERRORS
@@ -15851,12 +15851,12 @@ if test -n "$ticcutils_CFLAGS"; then
pkg_cv_ticcutils_CFLAGS="$ticcutils_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ticcutils >= 0.3 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "ticcutils >= 0.3 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ticcutils >= 0.4 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ticcutils >= 0.4 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_ticcutils_CFLAGS=`$PKG_CONFIG --cflags "ticcutils >= 0.3 " 2>/dev/null`
+ pkg_cv_ticcutils_CFLAGS=`$PKG_CONFIG --cflags "ticcutils >= 0.4 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15868,12 +15868,12 @@ if test -n "$ticcutils_LIBS"; then
pkg_cv_ticcutils_LIBS="$ticcutils_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ticcutils >= 0.3 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "ticcutils >= 0.3 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ticcutils >= 0.4 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ticcutils >= 0.4 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_ticcutils_LIBS=`$PKG_CONFIG --libs "ticcutils >= 0.3 " 2>/dev/null`
+ pkg_cv_ticcutils_LIBS=`$PKG_CONFIG --libs "ticcutils >= 0.4 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -15894,14 +15894,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ticcutils_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ticcutils >= 0.3 " 2>&1`
+ ticcutils_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ticcutils >= 0.4 " 2>&1`
else
- ticcutils_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ticcutils >= 0.3 " 2>&1`
+ ticcutils_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ticcutils >= 0.4 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ticcutils_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (ticcutils >= 0.3 ) were not met:
+ as_fn_error $? "Package requirements (ticcutils >= 0.4 ) were not met:
$ticcutils_PKG_ERRORS
@@ -16477,7 +16477,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mbt $as_me 3.2.9, which was
+This file was extended by mbt $as_me 3.2.10, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16543,7 +16543,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mbt config.status 3.2.9
+mbt config.status 3.2.10
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index a706ae9..bdf69e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac 15273 2012-10-10 12:26:42Z sloot $
+# $Id: configure.ac 15901 2013-04-03 12:33:53Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/configure.ac $
AC_PREREQ(2.61)
-AC_INIT([mbt],[3.2.9],[timbl at uvt.nl])
+AC_INIT([mbt],[3.2.10],[timbl at uvt.nl])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([.])
AC_CONFIG_MACRO_DIR([m4])
@@ -76,7 +76,7 @@ AC_ARG_WITH(timbl,
[PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"],
[PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"])
# AC_MSG_NOTICE( [pkg-config search path: $PKG_CONFIG_PATH] )
-PKG_CHECK_MODULES([timbl], [timbl >= 6.4.2] )
+PKG_CHECK_MODULES([timbl], [timbl >= 6.4.4] )
CXXFLAGS="$CXXFLAGS $timbl_CFLAGS"
LIBS="$LIBS $timbl_LIBS"
@@ -87,7 +87,7 @@ AC_ARG_WITH(ticcutils,
[PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$withval/lib/pkgconfig"],
[PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"])
# AC_MSG_NOTICE( [pkg-config search path: $PKG_CONFIG_PATH] )
-PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.3] )
+PKG_CHECK_MODULES([ticcutils], [ticcutils >= 0.4] )
CXXFLAGS="$CXXFLAGS $ticcutils_CFLAGS"
LIBS="$LIBS $ticcutils_LIBS"
diff --git a/include/mbt/Logging.h b/include/mbt/Logging.h
index afff44c..4551011 100644
--- a/include/mbt/Logging.h
+++ b/include/mbt/Logging.h
@@ -1,8 +1,8 @@
/*
- $Id: Logging.h 15273 2012-10-10 12:26:42Z sloot $
+ $Id: Logging.h 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/include/mbt/Logging.h $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/include/mbt/MbtAPI.h b/include/mbt/MbtAPI.h
index d512d54..5e86d06 100644
--- a/include/mbt/MbtAPI.h
+++ b/include/mbt/MbtAPI.h
@@ -1,8 +1,8 @@
/*
- $Id: MbtAPI.h 15061 2012-08-08 08:47:53Z sloot $
+ $Id: MbtAPI.h 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/include/mbt/MbtAPI.h $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/include/mbt/Pattern.h b/include/mbt/Pattern.h
index 93fb83c..0245be0 100644
--- a/include/mbt/Pattern.h
+++ b/include/mbt/Pattern.h
@@ -1,8 +1,8 @@
/*
- $Id: Pattern.h 15273 2012-10-10 12:26:42Z sloot $
+ $Id: Pattern.h 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/include/mbt/Pattern.h $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/include/mbt/Sentence.h b/include/mbt/Sentence.h
index 51cc893..6df4746 100644
--- a/include/mbt/Sentence.h
+++ b/include/mbt/Sentence.h
@@ -1,8 +1,8 @@
/*
- $Id: Sentence.h 15273 2012-10-10 12:26:42Z sloot $
+ $Id: Sentence.h 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/include/mbt/Sentence.h $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/include/mbt/TagLex.h b/include/mbt/TagLex.h
index 4c160e4..49eff80 100644
--- a/include/mbt/TagLex.h
+++ b/include/mbt/TagLex.h
@@ -1,8 +1,8 @@
/*
- $Id: TagLex.h 15273 2012-10-10 12:26:42Z sloot $
+ $Id: TagLex.h 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/include/mbt/TagLex.h $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/include/mbt/Tagger.h b/include/mbt/Tagger.h
index 799097f..03f95db 100644
--- a/include/mbt/Tagger.h
+++ b/include/mbt/Tagger.h
@@ -1,8 +1,8 @@
/*
- $Id: Tagger.h 15273 2012-10-10 12:26:42Z sloot $
+ $Id: Tagger.h 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/include/mbt/Tagger.h $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/mbt.pc b/mbt.pc
index 9754a1a..54c5a34 100644
--- a/mbt.pc
+++ b/mbt.pc
@@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: mbt
-Version: 3.2.9
+Version: 3.2.10
Description: mbt library.
Requires.private: timbl >= 6.4.2
Libs: -L${libdir} -lmbt
diff --git a/src/Makefile.am b/src/Makefile.am
index c83b24d..401dc25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 13164 2011-09-14 09:25:24Z sloot $
+# $Id: Makefile.am 15923 2013-04-03 15:50:58Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/Makefile.am $
AM_CPPFLAGS = -I at top_srcdir@/include
@@ -24,7 +24,7 @@ mbtg_SOURCES = Mbtg.cxx
convert_SOURCES = convert.cxx
lib_LTLIBRARIES = libmbt.la
-libmbt_la_LDFLAGS= -version-info 0:0:0
+libmbt_la_LDFLAGS= -version-info 1:0:0
libmbt_la_SOURCES = MbtAPI.cxx Pattern.cxx TagLex.cxx Sentence.cxx \
Tagger.cxx
diff --git a/src/Makefile.in b/src/Makefile.in
index 8981cb8..09c35cd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@
-# $Id: Makefile.am 13164 2011-09-14 09:25:24Z sloot $
+# $Id: Makefile.am 15923 2013-04-03 15:50:58Z sloot $
# $URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/Makefile.am $
@@ -273,7 +273,7 @@ mbt_SOURCES = Mbt.cxx
mbtg_SOURCES = Mbtg.cxx
convert_SOURCES = convert.cxx
lib_LTLIBRARIES = libmbt.la
-libmbt_la_LDFLAGS = -version-info 0:0:0
+libmbt_la_LDFLAGS = -version-info 1:0:0
libmbt_la_SOURCES = MbtAPI.cxx Pattern.cxx TagLex.cxx Sentence.cxx \
Tagger.cxx
diff --git a/src/Mbt.cxx b/src/Mbt.cxx
index afc035f..8dfb91b 100644
--- a/src/Mbt.cxx
+++ b/src/Mbt.cxx
@@ -1,8 +1,8 @@
/*
- $Id: Mbt.cxx 13844 2012-01-02 16:35:32Z sloot $
+ $Id: Mbt.cxx 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/Mbt.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/src/MbtAPI.cxx b/src/MbtAPI.cxx
index 13f63ae..2564d14 100644
--- a/src/MbtAPI.cxx
+++ b/src/MbtAPI.cxx
@@ -1,7 +1,7 @@
/*
- $Id: MbtAPI.cxx 14402 2012-03-07 14:04:57Z sloot $
+ $Id: MbtAPI.cxx 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/MbtAPI.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/src/Mbtg.cxx b/src/Mbtg.cxx
index 12096e4..931d661 100644
--- a/src/Mbtg.cxx
+++ b/src/Mbtg.cxx
@@ -1,8 +1,8 @@
/*
- $Id: Mbtg.cxx 13844 2012-01-02 16:35:32Z sloot $
+ $Id: Mbtg.cxx 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/Mbtg.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/src/Pattern.cxx b/src/Pattern.cxx
index ec41430..4a63208 100644
--- a/src/Pattern.cxx
+++ b/src/Pattern.cxx
@@ -1,8 +1,8 @@
/*
- $Id: Pattern.cxx 13844 2012-01-02 16:35:32Z sloot $
+ $Id: Pattern.cxx 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/Pattern.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/src/Sentence.cxx b/src/Sentence.cxx
index 4952ca1..bb2a1a5 100644
--- a/src/Sentence.cxx
+++ b/src/Sentence.cxx
@@ -1,8 +1,8 @@
/*
- $Id: Sentence.cxx 15273 2012-10-10 12:26:42Z sloot $
+ $Id: Sentence.cxx 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/Sentence.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/src/TagLex.cxx b/src/TagLex.cxx
index 2270100..c482028 100644
--- a/src/TagLex.cxx
+++ b/src/TagLex.cxx
@@ -1,8 +1,8 @@
/*
- $Id: TagLex.cxx 13844 2012-01-02 16:35:32Z sloot $
+ $Id: TagLex.cxx 15830 2013-03-28 11:58:23Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/TagLex.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
@@ -29,17 +29,16 @@
#include <algorithm>
#include <map>
+#include <vector>
#include <iostream>
#include <cstdlib>
#include <cstring>
#include <string>
-#include "timbl/StringOps.h"
-#include "timbl/Types.h"
+#include "ticcutils/StringOps.h"
#include "mbt/TagLex.h"
namespace Tagger {
- using namespace Timbl;
using namespace std;
TagInfo::TagInfo( const string& name, const string& tag ){
@@ -77,7 +76,7 @@ namespace Tagger {
string result;
map<string, int>::const_iterator it = TagFreqs.begin();
while ( it != TagFreqs.end() ){
- result += it->first + ":" + toString(it->second) + " ";
+ result += it->first + ":" + TiCC::toString(it->second) + " ";
++it;
}
return result;
@@ -158,7 +157,7 @@ namespace Tagger {
//
int diff = t2->Freq() - t1->Freq();
if ( diff == 0 ){
- if ( compare_nocase( t2->Word, t1->Word ) )
+ if ( TiCC::lowercase(t2->Word) == TiCC::lowercase(t1->Word) )
return strcmp( t2->Word.c_str(), t1->Word.c_str() ) < 0;
else
return strcmp( t1->Word.c_str(), t2->Word.c_str() ) < 0;
diff --git a/src/Tagger.cxx b/src/Tagger.cxx
index cf06860..fa8e0bb 100644
--- a/src/Tagger.cxx
+++ b/src/Tagger.cxx
@@ -1,8 +1,8 @@
/*
- $Id: Tagger.cxx 15061 2012-08-08 08:47:53Z sloot $
+ $Id: Tagger.cxx 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/Tagger.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
@@ -1349,7 +1349,7 @@ namespace Tagger {
bool TaggerClass::readsettings( string& fname ){
ifstream setfile( fname.c_str(), ios::in);
- if(setfile.bad()){
+ if( !setfile ){
return false;
}
char SetBuffer[512];
@@ -1602,7 +1602,7 @@ namespace Tagger {
void TaggerClass::manifest( ){
// present yourself to the user
//
- LOG << "mbt " << VERSION << " (c) ILK and CLiPS 1998 - 2012." << endl
+ LOG << "mbt " << VERSION << " (c) ILK and CLiPS 1998 - 2013." << endl
<< "Memory Based Tagger " << endl
<< "Tilburg University" << endl
<< "CLiPS Computational Linguistics Group, University of Antwerp"
@@ -1964,7 +1964,7 @@ namespace Tagger {
//
// present yourself to the user
//
- cerr << "mbtg " << VERSION << " (c) ILK and CLiPS 1998 - 2012." << endl
+ cerr << "mbtg " << VERSION << " (c) ILK and CLiPS 1998 - 2013." << endl
<< "Memory Based Tagger Generator" << endl
<< "Induction of Linguistic Knowledge Research Group,"
<< "Tilburg University" << endl
diff --git a/src/convert.cxx b/src/convert.cxx
index d5a6eac..a9a13e2 100644
--- a/src/convert.cxx
+++ b/src/convert.cxx
@@ -1,8 +1,8 @@
/*
- $Id: convert.cxx 13844 2012-01-02 16:35:32Z sloot $
+ $Id: convert.cxx 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/convert.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
diff --git a/src/simpletest.cxx b/src/simpletest.cxx
index b5324f8..e42b9bd 100644
--- a/src/simpletest.cxx
+++ b/src/simpletest.cxx
@@ -1,8 +1,8 @@
/*
- $Id: simpletest.cxx 14374 2012-03-05 11:13:09Z sloot $
+ $Id: simpletest.cxx 15567 2013-01-07 14:47:12Z sloot $
$URL: https://ilk.uvt.nl/svn/trunk/sources/Mbt3/src/simpletest.cxx $
- Copyright (c) 1998 - 2012
+ Copyright (c) 1998 - 2013
ILK - Tilburg University
CLiPS - University of Antwerp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mbt.git
More information about the debian-science-commits
mailing list