Skip to content
GitLab
Commit b22092ba authored by Chris Lahey's avatar Chris Lahey
Browse files

Added some number formatting code. Cleared the ChangeLog.

parent c5ceec1d
Hide whitespace changes
Inline Side-by-side
ChangeLog-1999-07-09
View file @ b22092ba
Fri Jun 26 14:40:03 1998 Scott D. Heavner <sdh@po.cwru.edu>
1998-07-03 Chris Lahey <clahey@umich.edu>
* configure.in: AC_CHECK_CURSES & AM_CONDITIONAL(HAS_CURSES)
* acconfig.h: AC_DEFINES from macros/curses.m4
* src/format.c: New file to do excel style number formatting.
1998-06-26 Raja R Harinath <harinath@cs.umn.edu>
1998-07-03 Chris Lahey <clahey@umich.edu>
* configure.in (AC_OUTPUT): Add `gyahtzee/pix/Makefile'.
1998-06-24 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtk_spin_button_set_snap_to_ticks): New check for
changed GtkSpinButton API.
Wed Jun 10 16:25:53 EDT 1998 Gregory McLean <gregm@comstar.net>
* acconfig.h (HAVE_DEVGTK): new tag.
Wed Jun 3 22:38:58 EDT 1998 Gregory McLean <gregm@comstar.net>
* acconfig.h : HAVE_GUILE new tag.
Sun Mar 8 18:30:57 1998 Tom Tromey <tromey@cygnus.com>
* version.h.in: Removed.
* configure.in: Don't create version.h.
* configure.in: Don't create support/Makefile.
* Makefile.am (SUBDIRS): Don't include support.
* configure.in: Don't call GNOME_SUPPORT_CHECKS.
1998-02-24 Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
* configure.in (ALL_LINGUAS): Added German translation.
1998-02-15 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (AC_OUTPUT): Also generate `macros/Makefile' and
`support/Makefile'.
* Makefile.am (SUBDIRS): Include `macros/' and `support/'.
(macros/macros.dep): Maintainer rule for auto-regeneration of
aclocal.m4.
* acconfig.h (HAVE_LIBSM): New tag.
Sat Feb 14 18:09:57 KST 1998 Changwoo Ryu <cwryu@adam.kaist.ac.kr>
* configure.in: Not output to freecell/Makefile.
1998-02-13 Raja R Harinath <harinath@cs.umn.edu>
* autogen.sh: Use `macros/autogen.sh' for the guts.
* ChangeLog: Cleared the gnome-games entries from the ChangeLog.
ChangeLog-2000-02-23
View file @ b22092ba
Fri Jun 26 14:40:03 1998 Scott D. Heavner <sdh@po.cwru.edu>
1998-07-03 Chris Lahey <clahey@umich.edu>
* configure.in: AC_CHECK_CURSES & AM_CONDITIONAL(HAS_CURSES)
* acconfig.h: AC_DEFINES from macros/curses.m4
* src/format.c: New file to do excel style number formatting.
1998-06-26 Raja R Harinath <harinath@cs.umn.edu>
1998-07-03 Chris Lahey <clahey@umich.edu>
* configure.in (AC_OUTPUT): Add `gyahtzee/pix/Makefile'.
1998-06-24 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtk_spin_button_set_snap_to_ticks): New check for
changed GtkSpinButton API.
Wed Jun 10 16:25:53 EDT 1998 Gregory McLean <gregm@comstar.net>
* acconfig.h (HAVE_DEVGTK): new tag.
Wed Jun 3 22:38:58 EDT 1998 Gregory McLean <gregm@comstar.net>
* acconfig.h : HAVE_GUILE new tag.
Sun Mar 8 18:30:57 1998 Tom Tromey <tromey@cygnus.com>
* version.h.in: Removed.
* configure.in: Don't create version.h.
* configure.in: Don't create support/Makefile.
* Makefile.am (SUBDIRS): Don't include support.
* configure.in: Don't call GNOME_SUPPORT_CHECKS.
1998-02-24 Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
* configure.in (ALL_LINGUAS): Added German translation.
1998-02-15 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (AC_OUTPUT): Also generate `macros/Makefile' and
`support/Makefile'.
* Makefile.am (SUBDIRS): Include `macros/' and `support/'.
(macros/macros.dep): Maintainer rule for auto-regeneration of
aclocal.m4.
* acconfig.h (HAVE_LIBSM): New tag.
Sat Feb 14 18:09:57 KST 1998 Changwoo Ryu <cwryu@adam.kaist.ac.kr>
* configure.in: Not output to freecell/Makefile.
1998-02-13 Raja R Harinath <harinath@cs.umn.edu>
* autogen.sh: Use `macros/autogen.sh' for the guts.
* ChangeLog: Cleared the gnome-games entries from the ChangeLog.
OChangeLog-1999-07-09
View file @ b22092ba
Fri Jun 26 14:40:03 1998 Scott D. Heavner <sdh@po.cwru.edu>
1998-07-03 Chris Lahey <clahey@umich.edu>
* configure.in: AC_CHECK_CURSES & AM_CONDITIONAL(HAS_CURSES)
* acconfig.h: AC_DEFINES from macros/curses.m4
* src/format.c: New file to do excel style number formatting.
1998-06-26 Raja R Harinath <harinath@cs.umn.edu>
1998-07-03 Chris Lahey <clahey@umich.edu>
* configure.in (AC_OUTPUT): Add `gyahtzee/pix/Makefile'.
1998-06-24 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtk_spin_button_set_snap_to_ticks): New check for
changed GtkSpinButton API.
Wed Jun 10 16:25:53 EDT 1998 Gregory McLean <gregm@comstar.net>
* acconfig.h (HAVE_DEVGTK): new tag.
Wed Jun 3 22:38:58 EDT 1998 Gregory McLean <gregm@comstar.net>
* acconfig.h : HAVE_GUILE new tag.
Sun Mar 8 18:30:57 1998 Tom Tromey <tromey@cygnus.com>
* version.h.in: Removed.
* configure.in: Don't create version.h.
* configure.in: Don't create support/Makefile.
* Makefile.am (SUBDIRS): Don't include support.
* configure.in: Don't call GNOME_SUPPORT_CHECKS.
1998-02-24 Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
* configure.in (ALL_LINGUAS): Added German translation.
1998-02-15 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (AC_OUTPUT): Also generate `macros/Makefile' and
`support/Makefile'.
* Makefile.am (SUBDIRS): Include `macros/' and `support/'.
(macros/macros.dep): Maintainer rule for auto-regeneration of
aclocal.m4.
* acconfig.h (HAVE_LIBSM): New tag.
Sat Feb 14 18:09:57 KST 1998 Changwoo Ryu <cwryu@adam.kaist.ac.kr>
* configure.in: Not output to freecell/Makefile.
1998-02-13 Raja R Harinath <harinath@cs.umn.edu>
* autogen.sh: Use `macros/autogen.sh' for the guts.
* ChangeLog: Cleared the gnome-games entries from the ChangeLog.
OChangeLog-2000-02-23
View file @ b22092ba
Fri Jun 26 14:40:03 1998 Scott D. Heavner <sdh@po.cwru.edu>
1998-07-03 Chris Lahey <clahey@umich.edu>
* configure.in: AC_CHECK_CURSES & AM_CONDITIONAL(HAS_CURSES)
* acconfig.h: AC_DEFINES from macros/curses.m4
* src/format.c: New file to do excel style number formatting.
1998-06-26 Raja R Harinath <harinath@cs.umn.edu>
1998-07-03 Chris Lahey <clahey@umich.edu>
* configure.in (AC_OUTPUT): Add `gyahtzee/pix/Makefile'.
1998-06-24 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (gtk_spin_button_set_snap_to_ticks): New check for
changed GtkSpinButton API.
Wed Jun 10 16:25:53 EDT 1998 Gregory McLean <gregm@comstar.net>
* acconfig.h (HAVE_DEVGTK): new tag.
Wed Jun 3 22:38:58 EDT 1998 Gregory McLean <gregm@comstar.net>
* acconfig.h : HAVE_GUILE new tag.
Sun Mar 8 18:30:57 1998 Tom Tromey <tromey@cygnus.com>
* version.h.in: Removed.
* configure.in: Don't create version.h.
* configure.in: Don't create support/Makefile.
* Makefile.am (SUBDIRS): Don't include support.
* configure.in: Don't call GNOME_SUPPORT_CHECKS.
1998-02-24 Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
* configure.in (ALL_LINGUAS): Added German translation.
1998-02-15 Raja R Harinath <harinath@cs.umn.edu>
* configure.in (AC_OUTPUT): Also generate `macros/Makefile' and
`support/Makefile'.
* Makefile.am (SUBDIRS): Include `macros/' and `support/'.
(macros/macros.dep): Maintainer rule for auto-regeneration of
aclocal.m4.
* acconfig.h (HAVE_LIBSM): New tag.
Sat Feb 14 18:09:57 KST 1998 Changwoo Ryu <cwryu@adam.kaist.ac.kr>
* configure.in: Not output to freecell/Makefile.
1998-02-13 Raja R Harinath <harinath@cs.umn.edu>
* autogen.sh: Use `macros/autogen.sh' for the guts.
* ChangeLog: Cleared the gnome-games entries from the ChangeLog.
src/format.c 0 → 100644
View file @ b22092ba
/* format.c - attempts to emulate excel's number formatting ability.
* Copyright (C) 1998 Chris Lahey
*
* 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 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
* 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, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <glib.h>
#include <stdio.h>
#include <math.h>
#include <string.h>
gchar *format_text( gchar *format, gdouble number );
void
test()
{
printf( "%s|\n", format_text( "??0000.00?", 12.3456789 ) );
printf( "%s|\n", format_text( "??0000.00?", 12.3 ) );
printf( "%s|\n", format_text( "??0000.00?", 12345.6789 ) );
printf( "%s|\n", format_text( "??????.00?", 0.123456789 ) );
printf( "%s|\n", format_text( "0.000,,", 12200000 ) );
}
int
main( int argc, gchar *argv )
{
test();
return 0;
}
void roundup( GString *string )
{
int i;
for ( i = string->len - 1; string->str[i] == '9'; i--)
{
string->str[i] = '0';
}
if ( string->str[i] == '.' )
{
/* FIXME */
}
else
{
string->str[i] ++;
}
}
gchar *
format_text( gchar *format, gdouble number )
{
gint left_req = 0, right_req = 0;
gint left_spaces = 0, right_spaces = 0;
gint right_allowed = 0;
gint i = 0;
gdouble temp;
gboolean negative = FALSE;
GString *string = g_string_new( "" );
#if 0
gint length;
#endif
gchar *returnvalue;
gint zero_count;
for ( i = 0; format[i] == '#'; i++ )
/* Empty statement */;
for ( ; format[i] == '?'; i++ )
left_spaces ++;
for ( ; format[i] == '0'; i++ )
{
left_req ++;
left_spaces ++;
}
if ( format[i] == '.' )
{
i++;
for ( ; format[i] == '0'; i++ )
{
right_req ++;
right_allowed ++;
right_spaces ++;
}
for ( ; format[i] == '?'; i++ )
{
right_spaces ++;
right_allowed ++;
}
for ( ; format[i] == '#'; i++ )
right_allowed ++;
}
for ( ; format[i] == ','; i++ )
number /= 1000.0;
if ( format[i] )
return NULL;
if ( number < 0.0 )
{
number = - number;
negative = TRUE;
}
#if 0
length = ceil( log10( number ) );
if ( log10( number ) == ceil( log10( number ) ) )
length ++;
length = length > left_req ? length : left_req;
length += 1;
length += right_allowed;
g_string_maybe_expand( string, length );
#endif
for ( temp = number; temp >= 1.0; temp /= 10.0 )
{
gint digit = floor( temp );
digit %= 10;
g_string_prepend_c( string, digit + '0' );
if ( left_req > 0 )
left_req --;
if ( left_spaces > 0 )
left_spaces --;
}
for ( ; left_req > 0; left_req --, left_spaces -- )
{
g_string_prepend_c( string, '0' );
}
for ( ; left_spaces > 0; left_spaces -- )
{
g_string_prepend_c( string, ' ' );
}
if( negative )
g_string_prepend_c( string, '-' );
g_string_append_c( string, '.' );
temp = number - floor( number );
for ( ; right_req > 0; right_req --, right_allowed --, right_spaces -- )
{
gint digit;
temp *= 10.0;
digit = floor( temp );
temp -= floor( temp );
if ( right_allowed == 1 && floor( temp * 10.0 ) >= 5 )
{
if ( digit < 9 )
digit ++;
else
{
digit = 0;
roundup( string );
}
}
g_string_append_c( string, digit + '0' );
}
zero_count = 0;
for ( ; right_allowed > 0; right_allowed -- )
{
gint digit;
temp *= 10.0;
digit = floor( temp );
temp -= floor( temp );
if ( right_allowed == 1 && floor( temp * 10.0 ) >= 5 )
{
if ( digit < 9 )
digit ++;
else
{
digit = 0;
roundup( string );
}
}
if ( digit == 0 )
zero_count ++;
else
{
right_spaces -= zero_count + 1;
zero_count = 0;
}
g_string_append_c( string, digit + '0' );
}
g_string_truncate( string, string->len - zero_count );
for ( ; right_spaces > 0; right_spaces -- )
{
g_string_append_c( string, ' ' );
}
returnvalue = g_malloc0( string->len + 1);
strncpy( returnvalue, string->str, string->len );
returnvalue[string->len] = 0;
g_string_free( string, TRUE );
return returnvalue;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment