Commit ab11a77a authored by Innocent De Marchi's avatar Innocent De Marchi

New upstream version 8.1.5+dfsg1

parent 8631f976
......@@ -4,6 +4,7 @@
*buttonFontList: *7x14bold*
*labelFontList: *7x14bold*
*textFontList: *7x14bold*
!*fontList: *0-0-0-0-p-0-iso8859-15*
!*buttonFontList: *times-bold-r-normal--14*
!*labelFontList: *times-bold-r-normal--14*
!*textFontList: *times-bold-r-normal--14*
......@@ -70,7 +71,7 @@ Abacuscn*format: Chinese
Abacuscn*leftAuxRails: 7
Abacuscn*rightAuxRails: 13
! Chinese Saun-pan (Suan Pan)
! Chinese Suanpan
Abacus*vertical: false
! colorScheme 1 color middle (1 or 2)
! 2 color first of group
......@@ -124,7 +125,7 @@ Abacus*format: Chinese
Abacus*museum: --
!
! override the above with these to have different abaci
! Chinese Saun-pan (Suan Pan)
! Chinese Suanpan
Abacuscn*format: Chinese
! Japanese post-WWII Soroban
Abacusjp*topNumber: 1
......@@ -134,7 +135,7 @@ Abacusjp*bottomSpaces: 1
Abacusjp*rails: 15
Abacusjp*diamond: true
Abacusjp*format: Japanese
! Korean Supan or Japanese pre-WWII Soroban
! Korean Jupan or Japanese pre-WWII Soroban
Abacusko*topNumber: 1
Abacusko*topSpaces: 1
Abacusko*bottomSpaces: 1
......@@ -161,7 +162,7 @@ Abacusro*format: Roman
!Abacusro*museum: uk
!Abacusro*museum: fr
Abacusro*museum: --
! Russian Schoty
! Russian Schety
Abacusru*vertical: true
Abacusru*colorScheme: 3
Abacusru*railIndex: 1
......@@ -175,7 +176,7 @@ Abacusru*bottomPiecePercent: 4
Abacusru*shiftPercent: 2
Abacusru*rails: 11
Abacusru*format: Russian
! Georgian Schoty (not to be taken seriously)
! Georgian Schety (not to be taken seriously)
Abacusge*vertical: true
Abacusge*colorScheme: 3
Abacusge*railIndex: 1
......@@ -240,7 +241,7 @@ Abacuscn12*bottomNumber: 2
Abacuscn12*base: 12
Abacuscn12*displayBase: 12
Abacuscn12*format: Generic
! Japanese base 16 Saun-pan
! Japanese base 16 Soroban
Abacus16*topFactor: 3
Abacus16*topNumber: 3
Abacus16*bottomNumber: 3
......
......@@ -1095,8 +1095,9 @@ checkBeads(AbacusWidget w)
/* not allowed by default, but user can change later */
w->abacus.vertical = False;
}
if (w->abacus.railIndex != 0)
if (w->abacus.railIndex != 0) {
w->abacus.railIndex = 1;
}
if (w->abacus.shiftPercent <= 0) {
w->abacus.shiftPercent = DEFAULT_SHIFT_PERCENT;
}
......@@ -1254,7 +1255,7 @@ checkBeads(AbacusWidget w)
w->abacus.vertical = True;
w->abacus.slot = False;
w->abacus.diamond = False;
w->abacus.railIndex = 3;
w->abacus.railIndex = 1;
setSpace(w, BOTTOM);
setSpace(w, TOP);
} else if (w->abacus.mode == DANISH) {
......@@ -1265,7 +1266,7 @@ checkBeads(AbacusWidget w)
w->abacus.decks[TOP].number = 0;
w->abacus.decks[BOTTOM].orientation = DEFAULT_BOTTOM_ORIENT;
w->abacus.decks[TOP].orientation = DEFAULT_TOP_ORIENT;
w->abacus.decks[BOTTOM].spaces = 4 * DEFAULT_BOTTOM_SPACES;
w->abacus.decks[BOTTOM].spaces = DEFAULT_BOTTOM_SPACES + 6;
w->abacus.decks[TOP].spaces = 0;
w->abacus.vertical = True;
w->abacus.slot = False;
......@@ -1281,7 +1282,7 @@ checkBeads(AbacusWidget w)
w->abacus.decks[TOP].number = 0;
w->abacus.decks[BOTTOM].orientation = DEFAULT_TOP_ORIENT;
w->abacus.decks[TOP].orientation = DEFAULT_TOP_ORIENT;
w->abacus.decks[BOTTOM].spaces = DEFAULT_BOTTOM_SPACES;
w->abacus.decks[BOTTOM].spaces = DEFAULT_BOTTOM_SPACES + 3;
w->abacus.decks[TOP].spaces = 0;
w->abacus.vertical = True;
w->abacus.slot = False;
......@@ -2036,7 +2037,8 @@ drawDecimalPointer(AbacusWidget w, int rail) {
static void
drawCounterDecimalSeparator(AbacusWidget w, int rail, Boolean show) {
int x, y, wd, ht;
int x, y, wd, ht, ht2, i;
int offset = 1 - w->abacus.railWidth % 2;
GC gc = ((show) ? w->abacus.symbolGC : w->abacus.inverseGC);
Pixmap dr = 0;
......@@ -2044,30 +2046,25 @@ drawCounterDecimalSeparator(AbacusWidget w, int rail, Boolean show) {
return;
wd = 1 + w->abacus.railWidth * 2;
x = middleBarPositionX(w, rail) + 2 +
w->abacus.beadSize.x / 2 + w->abacus.railWidth / 2;
(w->abacus.beadSize.x >> 1) + (w->abacus.railWidth >> 1);
y = w->abacus.middleBarPositionY;
if (w->abacus.vertical) {
y = w->abacus.frameSize.y - w->abacus.middleBarHeight - y;
}
ht = w->abacus.middleBarHeight - 1;
/* make a diamond, not historical but need
ht2 = ht >> 1;
/* make a <>, not historical but need
something when there is a decimal point */
VDRAWLINE(w, dr, gc,
x - wd, y + ht / 2, x, y + ht);
VDRAWLINE(w, dr, gc,
x - wd, y + ht / 2, x, y);
VDRAWLINE(w, dr, gc,
x + wd, y + ht / 2, x, y + ht);
VDRAWLINE(w, dr, gc,
x + wd, y + ht / 2, x, y);
VDRAWLINE(w, dr, gc,
x - wd + 1, y + ht / 2, x, y + ht - 1);
VDRAWLINE(w, dr, gc,
x - wd + 1, y + ht / 2, x, y + 1);
VDRAWLINE(w, dr, gc,
x + wd - 1, y + ht / 2, x, y + ht - 1);
VDRAWLINE(w, dr, gc,
x + wd - 1, y + ht / 2, x, y + 1);
for (i = 0; i <= w->abacus.railWidth; i++) {
VDRAWLINE(w, dr, gc,
x - wd + i - offset, y + ht2, x, y + ht - i);
VDRAWLINE(w, dr, gc,
x - wd + i - offset, y + ht2, x, y + i);
VDRAWLINE(w, dr, gc,
x + wd - i, y + ht2, x, y + ht - i);
VDRAWLINE(w, dr, gc,
x + wd - i, y + ht2, x, y + i);
}
}
static void
......@@ -2094,31 +2091,30 @@ drawDecimalSeparator(AbacusWidget w, int rail, Boolean show)
static void
drawCounterGroupSeparator(AbacusWidget w, int rail, Boolean show) {
int x, y, wd, ht;
int x, y, wd, ht, i;
int offset = 1 - w->abacus.railWidth % 2;
GC gc = ((show) ? w->abacus.symbolGC : w->abacus.inverseGC);
Pixmap dr = 0;
wd = 1 + w->abacus.railWidth * 2;
x = middleBarPositionX(w, rail) + 2 +
w->abacus.beadSize.x / 2 + w->abacus.railWidth / 2;
(w->abacus.beadSize.x >> 1) + (w->abacus.railWidth >> 1);
y = w->abacus.middleBarPositionY;
if (w->abacus.vertical) {
y = w->abacus.frameSize.y - w->abacus.middleBarHeight - y;
}
ht = w->abacus.middleBarHeight - 1;
/* make an X */
VDRAWLINE(w, dr, gc,
x + wd, y, x - wd, y + ht);
VDRAWLINE(w, dr, gc,
x - wd, y, x + wd, y + ht);
VDRAWLINE(w, dr, gc,
x + wd, y + 1, x - wd, y + ht - 1);
VDRAWLINE(w, dr, gc,
x - wd, y + 1, x + wd, y + ht - 1);
VDRAWLINE(w, dr, gc,
x + wd - 1, y, x - wd + 1, y + ht);
VDRAWLINE(w, dr, gc,
x - wd + 1, y, x + wd - 1 , y + ht);
for (i = 0; i <= w->abacus.railWidth; i++) {
VDRAWLINE(w, dr, gc,
x + wd, y + i, x - wd - offset, y + ht - i);
VDRAWLINE(w, dr, gc,
x - wd - offset, y + i, x + wd, y + ht - i);
VDRAWLINE(w, dr, gc,
x + wd - i, y, x - wd + i - offset, y + ht);
VDRAWLINE(w, dr, gc,
x - wd + i - offset, y, x + wd - i, y + ht);
}
}
static void
......@@ -7127,7 +7123,7 @@ Widget request, Widget renew
if (w->abacus.decks[BOTTOM].piecePercent != 0)
w->abacus.decimalPosition++;
/* w->abacus.decimalPosition = w->abacus.rails / 2 */
w->abacus.railIndex = 0;
//w->abacus.railIndex = 0;
setModeFromFormat(w);
setSubmodeFromMuseum(w);
checkBeads(w);
......
......@@ -22,6 +22,16 @@
#include "AbacusP.h"
#ifdef HAVE_GETTEXT
#include <stdio.h>
#include <stdlib.h>
#include <libintl.h>
#include <locale.h>
#define _(STRING) gettext(STRING)
#else
#define _(STRING) STRING
#endif
#define CHAR_TO_DIGIT(c) ((c >= 'A') ? c - 'A' + 10 : c - '0')
#define DIGIT_TO_CHAR(d) ((d >= 10) ? (char) ('A' + d - 10) : (char) ('0' + d))
#define IS_DIGIT(c) ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'J'))
......@@ -1337,6 +1347,7 @@ showHighlightRails(AbacusWidget w, int aux)
}
/* Tell about what is going to happen */
/* extra space at end is to get rid of [] bug */
static Boolean pendingUpdate(AbacusWidget w, char * buffer,
int line, int aux, int position, int base, int bottomNumber)
{
......@@ -1379,7 +1390,7 @@ static Boolean pendingUpdate(AbacusWidget w, char * buffer,
}
done = False;
}
(void) strcat(buffer, ".");
(void) strcat(buffer, ". ");
drawLineText(w, buffer, line);
return done;
}
......@@ -2022,7 +2033,7 @@ static void teachStepRoot(AbacusWidget w)
} else {
w->abacus.carryStep++;
}
(void) sprintf(buffer3, "Current answer (divide by %d): %s",
(void) sprintf(buffer3, "Current answer (divide by %d): %s ",
root, w->abacus.bString);
drawLineText(w, buffer3, 2);
} else {
......@@ -2040,13 +2051,13 @@ static void teachStepRoot(AbacusWidget w)
drawLineText(w, buffer3, 2);
showHighlightRails(w, 1);
} else {
(void) sprintf(buffer3, "Current answer (divide by %d): %s",
(void) sprintf(buffer3, "Current answer (divide by %d): %s ",
root, w->abacus.bString);
drawLineText(w, buffer3, 2);
}
}
} else {
(void) sprintf(buffer3, "Current answer (divide by %d): %s",
(void) sprintf(buffer3, "Current answer (divide by %d): %s ",
root, w->abacus.bString);
drawLineText(w, buffer3, 2);
if (w->abacus.carry[w->abacus.state] != 0) {
......@@ -2231,6 +2242,13 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
int bottomNumber = w->abacus.decks[BOTTOM].number;
double a, b;
#ifdef HAVE_GETTEXT
setlocale(LC_ALL, "");
/*bindtextdomain("AbacusT", getenv("PWD"));*/
bindtextdomain("AbacusT", "/usr/share/locale/");
textdomain("AbacusT");
#endif
#ifdef TEST
if (aux == 0) {
#if 0
......@@ -2345,7 +2363,7 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
decimalSafe(w->abacus.bString);
addSafe(w->abacus.aString, w->abacus.bString);
(void) strcpy(w->abacus.rString, w->abacus.aString);
(void) sprintf(buffer3, "Current answer: %s",
(void) sprintf(buffer3, "Current answer: %s ",
w->abacus.rString);
drawLineText(w, buffer3, 2);
w->abacus.step++;
......@@ -2380,7 +2398,7 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
decimalSafe(w->abacus.aString);
decimalSafe(w->abacus.bString);
(void) sprintf(w->abacus.rString, "0.");
(void) sprintf(buffer3, "Current answer: %s",
(void) sprintf(buffer3, "Current answer: %s ",
w->abacus.rString);
drawLineText(w, buffer3, 2);
w->abacus.step++;
......@@ -2423,7 +2441,7 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
decimalSafe(w->abacus.bString);
(void) strcpy(w->abacus.rString, w->abacus.aString);
(void) sprintf(w->abacus.sString, "0.");
(void) sprintf(buffer3, "Current answer: %s",
(void) sprintf(buffer3, "Current answer: %s ",
w->abacus.sString);
drawLineText(w, buffer3, 2);
w->abacus.step++;
......@@ -2455,7 +2473,7 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
drawLineText(w, buffer1, 0);
(void) strcpy(w->abacus.rString, w->abacus.aString);
(void) sprintf(w->abacus.sString, "0.");
(void) sprintf(buffer3, "Current answer: %s",
(void) sprintf(buffer3, "Current answer: %s ",
w->abacus.sString);
drawLineText(w, buffer3, 2);
w->abacus.step++;
......@@ -2665,16 +2683,22 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
contractStringBuffer(w->abacus.rString);
if (w->abacus.op == 'v' || w->abacus.op == 'u') {
contractStringBuffer(w->abacus.sString);
(void) sprintf(buffer3, "Final answer: %s",
(void) sprintf(buffer3,
"%s %s",
_("Final answer:"),
w->abacus.sString);
showHighlightRails(w, 1);
} else if (w->abacus.op == '/') {
contractStringBuffer(w->abacus.sString);
(void) sprintf(buffer3, "Final answer: %s",
(void) sprintf(buffer3,
"%s %s",
_("Final answer:"),
w->abacus.sString);
showHighlightRails(w, 2);
} else {
(void) sprintf(buffer3, "Final answer: %s",
(void) sprintf(buffer3,
"%s %s",
_("Final answer:"),
w->abacus.rString);
showHighlightRails(w, 0);
}
......@@ -2726,7 +2750,7 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
w->abacus.lower, w->abacus.upper);
w->abacus.reg = -1;
contractStringBuffer(w->abacus.sString);
(void) sprintf(buffer3, "Current answer: %s",
(void) sprintf(buffer3, "Current answer: %s ",
w->abacus.sString);
drawLineText(w, buffer3, 2);
return;
......@@ -2757,7 +2781,7 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
w->abacus.lower, w->abacus.upper);
w->abacus.reg = -1;
contractStringBuffer(w->abacus.sString);
(void) sprintf(buffer3, "Current answer: %s",
(void) sprintf(buffer3, "Current answer: %s ",
w->abacus.sString);
drawLineText(w, buffer3, 2);
return;
......@@ -2794,16 +2818,22 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
w->abacus.step = 0;
if (w->abacus.op == 'v' || w->abacus.op == 'u') {
contractStringBuffer(w->abacus.sString);
(void) sprintf(buffer3, "Final answer: %s",
(void) sprintf(buffer3,
"%s %s",
_("Final answer:"),
w->abacus.sString);
showHighlightRails(w, 1);
} else if (w->abacus.op == '/') {
contractStringBuffer(w->abacus.sString);
(void) sprintf(buffer3, "Final answer: %s",
(void) sprintf(buffer3,
"%s %s",
_("Final answer:"),
w->abacus.sString);
showHighlightRails(w, 2);
} else {
(void) sprintf(buffer3, "Final answer: %s",
(void) sprintf(buffer3,
"%s %s",
_("Final answer:"),
w->abacus.rString);
showHighlightRails(w, 0);
}
......@@ -2812,10 +2842,10 @@ void teachStep(AbacusWidget w, char * buffer, int aux)
if (w->abacus.op == '/' ||
w->abacus.op == 'v' || w->abacus.op == 'u') {
contractStringBuffer(w->abacus.sString);
(void) sprintf(buffer3, "Current answer: %s",
(void) sprintf(buffer3, "Current answer: %s ",
w->abacus.sString);
} else {
(void) sprintf(buffer3, "Current answer: %s",
(void) sprintf(buffer3, "Current answer: %s ",
w->abacus.rString);
}
drawLineText(w, buffer3, 2);
......
[Nov 16, 2017] V8.1.5:
Fix for railIndex, can now be set in generic mode.
Russian abacus the spaces were increased by 3.
Adding an experimental feature, gettext for locales. Its only
experimental an only used for teach mode. For now Motif does not
handle non-ASCII very well. Looking to just handle a simple
change first like French accents. Any examples of handling this
in Motif would be appreciated.
Spelling of Suanpan, Jupan, and Schety corrected.
Updated look of "X" and "<>" in medieval abacus.
[Oct 15, 2017] V8.1.4:
Teach fix for (division or root) and piece rail.
Teach fix for for lower bounds of rails with cube roots.
......
......@@ -339,15 +339,15 @@ roman :
roman8 :
./$(PROG) -nolee -roman -subdeck 3 -topPiece 2 -bottomPiece 6 -rails 10 -decimalPosition 2 -romanNumerals -noancientRoman -modernRoman -eighth -nolatin
#Russian Schoty
#Russian Schety
russian :
./$(PROG) -nolee -russian -bottomPiece 4 -rails 11
#Old Russian Schoty
#Old Russian Schety
russianold :
./$(PROG) -nolee -russian -bottomPiece 4 -bottomPiecePercent 4 -rails 11
#Georgian Schoty (not to be taken seriously)
#Georgian Schety (not to be taken seriously)
georgian :
./$(PROG) -nolee -russian -bottomPiece 4 -bottomPiecePercent 4 -rails 11 -base 20
......@@ -428,7 +428,8 @@ $(VER)/vms/make.com $(VER)/vms/mmov.com \
$(VER)/vms/vms_amd.c $(VER)/vms/vms_amd.h $(VER)/vms/vms_mmov.c \
$(VER)/win32/Makefile $(VER)/win32/w$(wIDGET).rc \
$(VER)/win32/bump.wav $(VER)/win32/move.wav $(VER)/win32/drip.wav \
$(VER)/win32/w$(wIDGET).ini $(VER)/win32/$(wIDGET).ico
$(VER)/win32/w$(wIDGET).ini $(VER)/win32/$(wIDGET).ico\
$(VER)/po/AbacusT.pot $(VER)/po/de/AbacusT.po $(VER)/po/fr/AbacusT.po
zip :
cd .. ; zip $(VER) $(PACKAGE)
......@@ -543,3 +544,8 @@ pixmaps/doc/Abacus001.png : Abacus.ps
done
doc : $(DOC)
# LC_ALL=fr_FR.UTF-8; export LC_ALL
msgfmt :
msgfmt --output-file=po/de/AbacusT.mo po/de/AbacusT.po
msgfmt --output-file=po/fr/AbacusT.mo po/fr/AbacusT.po
......@@ -11,9 +11,9 @@ Download: Primary site: http://www.sillycycle.com/abacus/
Maintainer: David A. Bagley <bagleyd AT verizon.net>
By default, this is an implementation of the classic Chinese abacus
(Saun-pan). Other implementations are easily configurable including
the Japanese Abacus (Soroban), the Korean Abacus (Supan), the Roman
Hand-abacus, the Russian Abacus (Schoty), and the Danish Learning
(Suanpan). Other implementations are easily configurable including
the Japanese Abacus (Soroban), the Korean Abacus (Jupan), the Roman
Hand-abacus, the Russian Abacus (Schety), and the Danish Learning
Abacus.
Essentially, this is a proof by induction that a computer is more
......
......@@ -8,7 +8,10 @@ other stuff to do
not really specific on what was out of date. Possibly its time to
adopt Gnome or KDE but do not yet see the value added over available
Java version. Also a big problem I see is that these other libraries
keep changing.
keep changing. Another thing is that Motif works great with Xt Widgets
which allows you to group widgets together easily like in "Lee's Abacus"
where I have a main abacus widget grouped together with 2 auxiliary
abacus widgets. I am not sure how I can port this feature.
3. What graphics in menu would help?
4. The calculator portion does not work for big numbers, i.e. where
one can type in math operations and see the abacus perform, e.g.
......@@ -32,3 +35,6 @@ other stuff to do
10. Code is there for Windows version to use abacusDemo.xml. Commented
out in win32/Makefile, as there is some issue with libxml2-2.dll at
runtime. Currently this just uses static fallback demo.
11. Add gettext for languages. So far it seems like Motif may not handle
non-ascii characters well which would make this feature moot. Looking
to see if any way around this without abandoning Motif.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xabacus 8.1.3.
# Generated by GNU Autoconf 2.69 for xabacus 8.1.5.
#
# Report bugs to <bagleyd AT verizon.net>.
#
......@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xabacus'
PACKAGE_TARNAME='xabacus'
PACKAGE_VERSION='8.1.3'
PACKAGE_STRING='xabacus 8.1.3'
PACKAGE_VERSION='8.1.5'
PACKAGE_STRING='xabacus 8.1.5'
PACKAGE_BUGREPORT='bagleyd AT verizon.net'
PACKAGE_URL=''
......@@ -724,6 +724,7 @@ with_xml2_prefix
with_xml2_includes
with_xml2_libraries
enable_lee_abacus
enable_gettext
'
ac_precious_vars='build_alias
host_alias
......@@ -1275,7 +1276,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 xabacus 8.1.3 to adapt to many kinds of systems.
\`configure' configures xabacus 8.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1344,7 +1345,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xabacus 8.1.3:";;
short | recursive ) echo "Configuration of xabacus 8.1.5:";;
esac
cat <<\_ACEOF
......@@ -1358,6 +1359,7 @@ Optional Features:
--disable-def-play=program
set def-play to program that plays sounds
--disable-lee-abacus implement a standard Abacus
--enable-gettext add locale, experimental
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......@@ -1458,7 +1460,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xabacus configure 8.1.3
xabacus configure 8.1.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1827,7 +1829,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 xabacus $as_me 8.1.3, which was
It was created by xabacus $as_me 8.1.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -5610,6 +5612,20 @@ $as_echo "#define LEE_ABACUS 1" >>confdefs.h
fi
# Check whether --enable-gettext was given.
if test "${enable_gettext+set}" = set; then :
enableval=$enable_gettext; gettext=$enableval
else
gettext=no
fi
if test "$gettext" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: defining option HAVE_GETTEXT" >&5
$as_echo "defining option HAVE_GETTEXT" >&6; }
$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
......@@ -5693,6 +5709,9 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>confdefs.h
*-*-cygwin* )
LIBS="${LIBS} -lSM -lICE"
if test "$gettext" = "yes"; then
LIBS="${LIBS} -lintl"
fi
;;
*-*-freebsd* | *-*-netbsd* | *-*-openbsd* )
......@@ -6300,7 +6319,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 xabacus $as_me 8.1.3, which was
This file was extended by xabacus $as_me 8.1.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -6353,7 +6372,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="\\
xabacus config.status 8.1.3
xabacus config.status 8.1.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -1236,9 +1236,16 @@ AC_ARG_ENABLE(lee_abacus, [ --disable-lee-abacus implement a standard Abacus
lee_abacus=yes)
if test "$lee_abacus" = "yes"; then
AC_MSG_RESULT([defining option LEE_ABACUS])
AC_DEFINE([LEE_ABACUS], [1], [an enhanced abacus with a movable decimal place holder and 2 auxiliary abacii])
AC_DEFINE([LEE_ABACUS], [1], [an enhanced abacus with a movable decimal place holder and 2 auxiliary abacii])
fi
AC_ARG_ENABLE(gettext, [ --enable-gettext add locale, experimental],
gettext=$enableval,
gettext=no)
if test "$gettext" = "yes"; then
AC_MSG_RESULT([defining option HAVE_GETTEXT])
AC_DEFINE([HAVE_GETTEXT], [1], [add locale])
fi
dnl Now we handle the various system dependent problems
dnl that aren't addressed in the X header files, or things dealing
dnl with utility quirks on some systems.
......@@ -1253,6 +1260,9 @@ case "${canonical}" in
*-*-cygwin* )
LIBS="${LIBS} -lSM -lICE"
if test "$gettext" = "yes"; then
LIBS="${LIBS} -lintl"
fi
;;
*-*-freebsd* | *-*-netbsd* | *-*-openbsd* )
......
x(m)abacus for Debian
---------------------
You can copy /etc/X11/app-defaults/Abacus to $(HOME)/Abacus and modify the
local copy for adjusting the way x(m)abacus looks and feels.
-- Florian Ernst <florian@debian.org>, Sun, 23 Jan 2005 15:48:48 +0100
This diff is collapsed.
Source: xabacus
Section: games
Priority: optional
Maintainer: Innocent De Marchi <tangram.peces@gmail.com>
Standards-Version: 4.1.1
Build-Depends: debhelper (>= 10),
dpkg-dev (>= 1.16.1~),
libaudiofile-dev,
libaudio-dev,
libmotif-dev,
libxpm-dev,
libxt-dev
Homepage: http://www.sillycycle.com/abacus.html
Vcs-Browser: https://anonscm.debian.org/git/collab-maint/xabacus.git
Vcs-Git: https://anonscm.debian.org/git/collab-maint/xabacus.git
Package: xabacus
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: xabacus
Conflicts: xabacus
Replaces: xabacus
Description: simulation of the ancient calculator (plain X version)
This program is an implementation of the original abacus, it provides
the Chinese, Japanese, Korean, Roman and Russian version and can be
modified to allow others.
.
This version was compiled without the Motif GUI widget library and thus
shows limited user interface functionality. See xmabacus for the
extended version.
Package: xmabacus
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: xabacus
Conflicts: xabacus
Replaces: xabacus
Description: simulation of the ancient calculator (Motif version)
This program is an implementation of the original abacus, it provides
the Chinese, Japanese, Korean, Roman and Russian version and can be
modified to allow others.
.
This is the Motif version which shows additional functionality. Motif
is a GUI widget library for the X Window system.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: Abacus
Upstream-Contact: David A. Bagley <bagleyd AT verizon.net>
Source: http://www.sillycycle.com/abacus/
Files: *
Copyright: 1992-2016, David A. Bagley <bagleyd AT verizon.net>
with Thanks to,
Luis Fernandes <elf AT ee.ryerson.ca> - independent xabacus 1.00, initial demo
Sarat Chandran <saratcmahadevan AT yahoo.com> - collaboration on a few ideas
.
The files file.{c,h} and sound.{c,h} are taken from xlock, many authors...
.
For the files rngs.{c,h} the following is given:
Dr. Park's algorithm published in the Oct. '88 ACM
"Random Number Generators: Good Ones Are Hard To Find"
His version available at ftp://cs.wm.edu/pub/rngs.tar
Present form by many authors.
License: Custom
Files: install-sh
Copyright: 1994, X Consortium
License: MIT
Files: debian/*
Copyright: 1998-until 12 Mar 2000, Darren Benham <gecko@debian.org>
until 14 Sep 2000, Christian Kurz <shorty@debian.org>
until 24 May 2001, Adrian Bunk <bunk@fs.tum.de>
until 28 Jul 2004, Eric Van Buggenhaut <ericvb@debian.org>
until 23 Dec 2005, Florian Ernst <florian@debian.org>
until 11 Aug 2006, Jose Carlos Medeiros <debian@psabs.com.br>
until 29 Sep 2017, Florian Ernst <florian@debian.org>
2017, Innocent De Marchi <tangram.peces@gmail.com>
License: GPL-3+
License: Custom
All Rights Reserved
.
Permission to use, copy, modify, and distribute this software and
its documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and
that both that copyright notice and this permission notice appear in
supporting documentation, and that the name of the author not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
.
This program is distributed in the hope that it will be "useful",
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
License: GPL-3+
This package 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 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
License: MIT
Copyright (c) 1994 X Consortium
.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the