[Tux4kids-commits] r801 - in tuxmath/trunk: . data/images/factoroids data/images/sprites intl po src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Fri Dec 12 02:45:17 UTC 2008
Author: dbruce-guest
Date: 2008-12-12 02:45:17 +0000 (Fri, 12 Dec 2008)
New Revision: 801
Modified:
tuxmath/trunk/config.h.in
tuxmath/trunk/configure
tuxmath/trunk/configure.ac
tuxmath/trunk/data/images/factoroids/Makefile.in
tuxmath/trunk/data/images/sprites/Makefile.in
tuxmath/trunk/intl/plural.c
tuxmath/trunk/po/ar.po
tuxmath/trunk/po/cs.po
tuxmath/trunk/po/de.po
tuxmath/trunk/po/en at boldquot.po
tuxmath/trunk/po/en at quot.po
tuxmath/trunk/po/en_GB.po
tuxmath/trunk/po/es.po
tuxmath/trunk/po/fi.po
tuxmath/trunk/po/fr.po
tuxmath/trunk/po/ga.po
tuxmath/trunk/po/he.po
tuxmath/trunk/po/hu.po
tuxmath/trunk/po/it.po
tuxmath/trunk/po/ja.po
tuxmath/trunk/po/nb.po
tuxmath/trunk/po/nl.po
tuxmath/trunk/po/nn.po
tuxmath/trunk/po/oc.po
tuxmath/trunk/po/pl.po
tuxmath/trunk/po/pt.po
tuxmath/trunk/po/pt_BR.po
tuxmath/trunk/po/ru.po
tuxmath/trunk/po/sk.po
tuxmath/trunk/po/sv.po
tuxmath/trunk/po/tr.po
tuxmath/trunk/po/tuxmath.pot
tuxmath/trunk/po/zh_CN.po
tuxmath/trunk/src/Makefile.am
tuxmath/trunk/src/lessons.c
Log:
1. fix of lessons.c - needed #include <string.h>
2. update Makefile.am to build generate_lesson as part of default build
Modified: tuxmath/trunk/config.h.in
===================================================================
--- tuxmath/trunk/config.h.in 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/config.h.in 2008-12-12 02:45:17 UTC (rev 801)
@@ -43,6 +43,9 @@
/* Define to 1 if you have the `atexit' function. */
#undef HAVE_ATEXIT
+/* Define to 1 if you have the `basename' function. */
+#undef HAVE_BASENAME
+
/* Define to 1 if you have the `bcopy' function. */
#undef HAVE_BCOPY
@@ -149,6 +152,9 @@
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
+/* Define to 1 if you have the <libgen.h> header file. */
+#undef HAVE_LIBGEN_H
+
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/configure 2008-12-12 02:45:17 UTC (rev 801)
@@ -15564,7 +15564,8 @@
-for ac_header in argz.h error.h errno.h fcntl.h float.h iconv.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h wchar.h
+
+for ac_header in argz.h error.h errno.h fcntl.h float.h iconv.h inttypes.h langinfo.h libgen.h libintl.h limits.h locale.h malloc.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h wchar.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -17575,7 +17576,8 @@
-for ac_func in __argz_count __argz_next __argz_stringify atexit bcopy getcwd localtime_r memmove mempcpy memset mkdir munmap nl_langinfo scandir setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul
+
+for ac_func in __argz_count __argz_next __argz_stringify atexit basename bcopy getcwd localtime_r memmove mempcpy memset mkdir munmap nl_langinfo scandir setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/configure.ac 2008-12-12 02:45:17 UTC (rev 801)
@@ -129,7 +129,7 @@
AC_FUNC_ALLOCA
AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_CHECK_HEADERS([argz.h error.h errno.h fcntl.h float.h iconv.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h wchar.h])
+AC_CHECK_HEADERS([argz.h error.h errno.h fcntl.h float.h iconv.h inttypes.h langinfo.h libgen.h libintl.h limits.h locale.h malloc.h stddef.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h wchar.h])
# --------------------------------------------------------------------------------------------
@@ -160,7 +160,7 @@
AC_FUNC_STRCOLL
AC_FUNC_STRTOD
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit bcopy getcwd localtime_r memmove mempcpy memset mkdir munmap nl_langinfo scandir setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul])
+AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify atexit basename bcopy getcwd localtime_r memmove mempcpy memset mkdir munmap nl_langinfo scandir setlocale stpcpy strcasecmp strchr strcspn strdup strncasecmp strndup strstr strtoul])
# Set PACKAGE_DATA_DIR
Modified: tuxmath/trunk/data/images/factoroids/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/factoroids/Makefile.in 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/data/images/factoroids/Makefile.in 2008-12-12 02:45:17 UTC (rev 801)
@@ -41,8 +41,8 @@
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intmax.m4 \
- $(top_srcdir)/m4/inttypes-pri.m4 \
+ $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+ $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/data/images/sprites/Makefile.in 2008-12-12 02:45:17 UTC (rev 801)
@@ -41,8 +41,8 @@
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
- $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intmax.m4 \
- $(top_srcdir)/m4/inttypes-pri.m4 \
+ $(top_srcdir)/m4/intldir.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+ $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
Modified: tuxmath/trunk/intl/plural.c
===================================================================
--- tuxmath/trunk/intl/plural.c 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/intl/plural.c 2008-12-12 02:45:17 UTC (rev 801)
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.3a. */
+/* A Bison parser, made by GNU Bison 2.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
@@ -47,7 +47,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3a"
+#define YYBISON_VERSION "2.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -68,9 +68,31 @@
#define yynerrs __gettextnerrs
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum yytokentype {
+ EQUOP2 = 258,
+ CMPOP2 = 259,
+ ADDOP2 = 260,
+ MULOP2 = 261,
+ NUMBER = 262
+ };
+#endif
+/* Tokens. */
+#define EQUOP2 258
+#define CMPOP2 259
+#define ADDOP2 260
+#define MULOP2 261
+#define NUMBER 262
+
+
+
+
/* Copy the first part of user declarations. */
-/* Line 164 of yacc.c. */
-#line 1 "plural.y"
+#line 1 "../../trunk/intl/plural.y"
/* Expression parsing for plural form selection.
Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc.
@@ -137,53 +159,26 @@
# define YYTOKEN_TABLE 0
#endif
-
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- EQUOP2 = 258,
- CMPOP2 = 259,
- ADDOP2 = 260,
- MULOP2 = 261,
- NUMBER = 262
- };
-#endif
-/* Tokens. */
-#define EQUOP2 258
-#define CMPOP2 259
-#define ADDOP2 260
-#define MULOP2 261
-#define NUMBER 262
-
-
-
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-{/* Line 191 of yacc.c. */
-#line 51 "plural.y"
-
+#line 51 "../../trunk/intl/plural.y"
+{
unsigned long int num;
enum expression_operator op;
struct expression *exp;
}
-/* Line 191 of yacc.c. */
-#line 175 "plural.c"
+/* Line 187 of yacc.c. */
+#line 172 "../../trunk/intl/plural.c"
YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
#endif
-
/* Copy the second part of user declarations. */
-/* Line 221 of yacc.c. */
-#line 57 "plural.y"
+#line 57 "../../trunk/intl/plural.y"
/* Prototypes for local functions. */
static int yylex (YYSTYPE *lval, const char **pexp);
@@ -260,9 +255,10 @@
}
-/* Line 221 of yacc.c. */
-#line 265 "plural.c"
+/* Line 216 of yacc.c. */
+#line 261 "../../trunk/intl/plural.c"
+
#ifdef short
# undef short
#endif
@@ -336,14 +332,14 @@
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int yyi)
+YYID (int i)
#else
static int
-YYID (yyi)
- int yyi;
+YYID (i)
+ int i;
#endif
{
- return yyi;
+ return i;
}
#endif
@@ -836,20 +832,17 @@
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
#else
static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+ yytype_int16 *bottom;
+ yytype_int16 *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
- for (; yybottom <= yytop; yybottom++)
- {
- int yybot = *yybottom;
- YYFPRINTF (stderr, " %d", yybot);
- }
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
YYFPRINTF (stderr, "\n");
}
@@ -1216,10 +1209,10 @@
#endif
#endif
{
- /* The lookahead symbol. */
+ /* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
/* Number of syntax errors so far. */
@@ -1230,7 +1223,7 @@
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
- /* Lookahead token as an internal (translated) token number. */
+ /* Look-ahead token as an internal (translated) token number. */
int yytoken = 0;
#if YYERROR_VERBOSE
/* Buffer for error messages, and its allocated size. */
@@ -1367,9 +1360,6 @@
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
- if (yystate == YYFINAL)
- YYACCEPT;
-
goto yybackup;
/*-----------.
@@ -1378,16 +1368,16 @@
yybackup:
/* Do appropriate processing given the current state. Read a
- lookahead token if we need one and don't already have one. */
+ look-ahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1419,16 +1409,20 @@
goto yyreduce;
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the lookahead token. */
+ /* Shift the look-ahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
- /* Discard the shifted token. */
- yychar = YYEMPTY;
+ /* Discard the shifted token unless it is eof. */
+ if (yychar != YYEOF)
+ yychar = YYEMPTY;
yystate = yyn;
*++yyvsp = yylval;
@@ -1468,8 +1462,7 @@
switch (yyn)
{
case 2:
-/* Line 1269 of yacc.c. */
-#line 155 "plural.y"
+#line 155 "../../trunk/intl/plural.y"
{
if ((yyvsp[(1) - (1)].exp) == NULL)
YYABORT;
@@ -1478,80 +1471,70 @@
break;
case 3:
-/* Line 1269 of yacc.c. */
-#line 163 "plural.y"
+#line 163 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp));
}
break;
case 4:
-/* Line 1269 of yacc.c. */
-#line 167 "plural.y"
+#line 167 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 5:
-/* Line 1269 of yacc.c. */
-#line 171 "plural.y"
+#line 171 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 6:
-/* Line 1269 of yacc.c. */
-#line 175 "plural.y"
+#line 175 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 7:
-/* Line 1269 of yacc.c. */
-#line 179 "plural.y"
+#line 179 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 8:
-/* Line 1269 of yacc.c. */
-#line 183 "plural.y"
+#line 183 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 9:
-/* Line 1269 of yacc.c. */
-#line 187 "plural.y"
+#line 187 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
}
break;
case 10:
-/* Line 1269 of yacc.c. */
-#line 191 "plural.y"
+#line 191 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp));
}
break;
case 11:
-/* Line 1269 of yacc.c. */
-#line 195 "plural.y"
+#line 195 "../../trunk/intl/plural.y"
{
(yyval.exp) = new_exp_0 (var);
}
break;
case 12:
-/* Line 1269 of yacc.c. */
-#line 199 "plural.y"
+#line 199 "../../trunk/intl/plural.y"
{
if (((yyval.exp) = new_exp_0 (num)) != NULL)
(yyval.exp)->val.num = (yyvsp[(1) - (1)].num);
@@ -1559,16 +1542,15 @@
break;
case 13:
-/* Line 1269 of yacc.c. */
-#line 204 "plural.y"
+#line 204 "../../trunk/intl/plural.y"
{
(yyval.exp) = (yyvsp[(2) - (3)].exp);
}
break;
-/* Line 1269 of yacc.c. */
-#line 1572 "plural.c"
+/* Line 1267 of yacc.c. */
+#line 1554 "../../trunk/intl/plural.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1644,7 +1626,7 @@
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -1661,7 +1643,7 @@
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -1718,6 +1700,9 @@
YY_STACK_PRINT (yyss, yyssp);
}
+ if (yyn == YYFINAL)
+ YYACCEPT;
+
*++yyvsp = yylval;
@@ -1753,7 +1738,7 @@
#endif
yyreturn:
- if (yychar != YYEMPTY)
+ if (yychar != YYEOF && yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
@@ -1779,8 +1764,7 @@
}
-/* Line 1486 of yacc.c. */
-#line 209 "plural.y"
+#line 209 "../../trunk/intl/plural.y"
void
Modified: tuxmath/trunk/po/ar.po
===================================================================
--- tuxmath/trunk/po/ar.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/ar.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-02-15 03:00+0100\n"
"Last-Translator: Caroline Ford <caroline.ford.work at googlemail.com>\n"
"Language-Team: \n"
Modified: tuxmath/trunk/po/cs.po
===================================================================
--- tuxmath/trunk/po/cs.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/cs.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2007-11-12 20:54+0100\n"
"Last-Translator: JardaK <krejci at zstenis.com>\n"
"Language-Team: czech <cs at li.org>\n"
Modified: tuxmath/trunk/po/de.po
===================================================================
--- tuxmath/trunk/po/de.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/de.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-05-02 16:08+0200\n"
"Last-Translator: Lars Vogdt <lars at linux-schulserver.de>\n"
"MIME-Version: 1.0\n"
Modified: tuxmath/trunk/po/en at boldquot.po
===================================================================
--- tuxmath/trunk/po/en at boldquot.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/en at boldquot.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -29,10 +29,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tux Of Math Command 1.7.0\n"
+"Project-Id-Version: tuxmath 1.7.0\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
-"PO-Revision-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
+"PO-Revision-Date: 2008-12-11 20:44-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
Modified: tuxmath/trunk/po/en at quot.po
===================================================================
--- tuxmath/trunk/po/en at quot.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/en at quot.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -26,10 +26,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Tux Of Math Command 1.7.0\n"
+"Project-Id-Version: tuxmath 1.7.0\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
-"PO-Revision-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
+"PO-Revision-Date: 2008-12-11 20:44-0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
Modified: tuxmath/trunk/po/en_GB.po
===================================================================
--- tuxmath/trunk/po/en_GB.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/en_GB.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-05-09 21:05+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
Modified: tuxmath/trunk/po/es.po
===================================================================
--- tuxmath/trunk/po/es.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/es.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 1.6.2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-04-26\n"
"Last-Translator: Angela Ruiz <angieruiz211 at hotmail.com>\n"
"Language-Team: espanol <LL at li.org>\n"
Modified: tuxmath/trunk/po/fi.po
===================================================================
--- tuxmath/trunk/po/fi.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/fi.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-03-22 06:59+0000\n"
"Last-Translator: Miika Metsälä <Unknown>\n"
"Language-Team: Finnish <fi at li.org>\n"
Modified: tuxmath/trunk/po/fr.po
===================================================================
--- tuxmath/trunk/po/fr.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/fr.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 1.5.8\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2007-11-15 09:00+0100\n"
"Last-Translator: Grumeau Rémi <remi at beosfrance.com>\n"
"Language-Team: Dutch <LL at li.org>\n"
Modified: tuxmath/trunk/po/ga.po
===================================================================
--- tuxmath/trunk/po/ga.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/ga.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-07-13 23:16-0000\n"
"Last-Translator: Seanán à CoistÃn <seananoc at gmail.com>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: tuxmath/trunk/po/he.po
===================================================================
--- tuxmath/trunk/po/he.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/he.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-03-17 13:30+0000\n"
"Last-Translator: Yaron <sh.yaron at gmail.com>\n"
"Language-Team: Hebrew <he at li.org>\n"
Modified: tuxmath/trunk/po/hu.po
===================================================================
--- tuxmath/trunk/po/hu.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/hu.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-02-11 21:56+0100\n"
"Last-Translator: Miklos Merenyi <mermik at freemail.hu>\n"
"Language-Team: LANGUAGE <HU at li.org>\n"
Modified: tuxmath/trunk/po/it.po
===================================================================
--- tuxmath/trunk/po/it.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/it.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-03-01 11:49+0000\n"
"Last-Translator: Giovanni Condello <condellog at gmail.com>\n"
"Language-Team: Italian <it at li.org>\n"
Modified: tuxmath/trunk/po/ja.po
===================================================================
--- tuxmath/trunk/po/ja.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/ja.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-03-05 15:29+0000\n"
"Last-Translator: CMasami <Unknown>\n"
"Language-Team: Japanese <ja at li.org>\n"
Modified: tuxmath/trunk/po/nb.po
===================================================================
--- tuxmath/trunk/po/nb.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/nb.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-09-21 19:08+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
Modified: tuxmath/trunk/po/nl.po
===================================================================
--- tuxmath/trunk/po/nl.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/nl.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2007-11-15 09:00+0100\n"
"Last-Translator: Schrijvers Luc <Begasus at skynet.be>\n"
"Language-Team: Dutch <LL at li.org>\n"
Modified: tuxmath/trunk/po/nn.po
===================================================================
--- tuxmath/trunk/po/nn.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/nn.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-09-21 19:06+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
Modified: tuxmath/trunk/po/oc.po
===================================================================
--- tuxmath/trunk/po/oc.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/oc.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-02-25 16:55+0000\n"
"Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannig at marchegay.org>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
Modified: tuxmath/trunk/po/pl.po
===================================================================
--- tuxmath/trunk/po/pl.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/pl.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-02-25 18:43+0000\n"
"Last-Translator: Mateusz Tybura <wujciol at gmail.com>\n"
"Language-Team: Polish <pl at li.org>\n"
Modified: tuxmath/trunk/po/pt.po
===================================================================
--- tuxmath/trunk/po/pt.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/pt.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-04-12 04:12+0000\n"
"Last-Translator: Mykas0 <Mykas0 at gmail.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
Modified: tuxmath/trunk/po/pt_BR.po
===================================================================
--- tuxmath/trunk/po/pt_BR.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/pt_BR.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-03-03 21:35+0000\n"
"Last-Translator: Laudeci Oliveira <laudeci at gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR at li.org>\n"
Modified: tuxmath/trunk/po/ru.po
===================================================================
--- tuxmath/trunk/po/ru.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/ru.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-03-01 06:56+0000\n"
"Last-Translator: Александр AldeX Крылов <Unknown>\n"
"Language-Team: Russian <ru at li.org>\n"
Modified: tuxmath/trunk/po/sk.po
===================================================================
--- tuxmath/trunk/po/sk.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/sk.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-03-16 09:41+0000\n"
"Last-Translator: Štefan Lučivjanský <lucorp at azet.sk>\n"
"Language-Team: Slovak <sk at li.org>\n"
Modified: tuxmath/trunk/po/sv.po
===================================================================
--- tuxmath/trunk/po/sv.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/sv.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: \n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
Modified: tuxmath/trunk/po/tr.po
===================================================================
--- tuxmath/trunk/po/tr.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/tr.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: tr2\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-12-07 15:54+0200\n"
"Last-Translator: Doruk Fisek <dfisek at fisek.com.tr>\n"
"Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
Modified: tuxmath/trunk/po/tuxmath.pot
===================================================================
--- tuxmath/trunk/po/tuxmath.pot 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/tuxmath.pot 2008-12-12 02:45:17 UTC (rev 801)
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: tuxmath 1.7.0\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: tuxmath/trunk/po/zh_CN.po
===================================================================
--- tuxmath/trunk/po/zh_CN.po 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/po/zh_CN.po 2008-12-12 02:45:17 UTC (rev 801)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: tuxmath\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-08 19:43-0600\n"
+"POT-Creation-Date: 2008-12-11 20:44-0600\n"
"PO-Revision-Date: 2008-02-22 11:56+0000\n"
"Last-Translator: TeliuTe <teliute at 163.com>\n"
"Language-Team: Simplified Chinese <zh_CN at li.org>\n"
Modified: tuxmath/trunk/src/Makefile.am
===================================================================
--- tuxmath/trunk/src/Makefile.am 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/src/Makefile.am 2008-12-12 02:45:17 UTC (rev 801)
@@ -19,7 +19,7 @@
bin_PROGRAMS = TuxMath
else
TUXMATHRC =
-bin_PROGRAMS = tuxmath tuxmathadmin
+bin_PROGRAMS = tuxmath tuxmathadmin generate_lesson
endif
tuxmath_SOURCES = tuxmath.c \
@@ -48,10 +48,17 @@
tuxmathadmin_SOURCES = tuxmathadmin.c
+generate_lesson_SOURCES = generate_lesson.c \
+ mathcards.c \
+ options.c \
+ fileops.c \
+ lessons.c
+
EXTRA_DIST = credits.h \
+ factoroids.h \
fileops.h \
game.h \
- factoroids.h \
+ globals.h \
highscore.h \
mathcards.h \
options.h \
@@ -69,7 +76,6 @@
pixels.h \
compiler.h
-
WINDRES=@WINDRES@
if BUILD_MINGW32
Modified: tuxmath/trunk/src/lessons.c
===================================================================
--- tuxmath/trunk/src/lessons.c 2008-12-12 01:15:05 UTC (rev 800)
+++ tuxmath/trunk/src/lessons.c 2008-12-12 02:45:17 UTC (rev 801)
@@ -10,7 +10,13 @@
*
*/
#include <stdio.h>
+//for strtok()
+#include <string.h>
#include "lessons.h"
+//for basename(), if available
+#ifdef HAVE_LIBGEN_H
+#include <libgen.h>
+#endif
// extern unsigned char **lesson_list_titles;
// extern unsigned char **lesson_list_filenames;
@@ -68,7 +74,6 @@
if (!token)
continue;
-
/* Now set "goldstar" to 1 if we find a matching lesson: */
for (i = 0; i < num_lessons; i++)
{
@@ -121,13 +126,18 @@
return;
}
-/* FIXME need to get correct function - basename() wasn't correct */
+
/* Perform a strcasecmp() on two path strings, stripping away all the */
/* dirs in the path and just comparing the filenames themselves: */
+/* FIXME: basename() may not be available on all platforms. */
+/* If not available, just compare the full paths. Consider including */
+/* our own implementation at some point. */
static int filename_comp(const char* s1, const char* s2)
{
- const char* f1 = s1; //basename(s1);
- const char* f2 = s2; //basename(s2);
+#ifdef HAVE_BASENAME
+ return strcasecmp(basename(s1), basename(s2));
+#else
return strcasecmp(f1, f2);
+#endif
}
More information about the Tux4kids-commits
mailing list