drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-19 01:13:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix comma.cal to avoid leading 0's and tilde's

Browse Source
This commit is contained in:
Landon Curt Noll
2022-06-20 19:20:34 -07:00
parent 6fc14730c0
commit 8dc52a532a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cal/comma.cal
View File

@@ -138,6 +138,8 @@ define str_comma(x, group, decimal)
local frac_str; /* fraction as a string */ local frac_str; /* fraction as a string */
local frac_len; /* number of digits in frac_str including leading 0. */ local frac_len; /* number of digits in frac_str including leading 0. */
local ret; /* string to return */ local ret; /* string to return */
local config_leadzero; /* config("leadzero") to restore */
local config_tilde; /* config("tilde") to restore */
local i; local i;
/* /*
@@ -173,9 +175,15 @@ define str_comma(x, group, decimal)
/* /*
* convert digits * convert digits
*
* Avoid printing ~ and leading zeros for factional part.
*/ */
int_str = strprintf("%d", integer); int_str = strprintf("%d", integer);
config_leadzero = config("leadzero", 0);
config_tilde = config("tilde", 0);
frac_str = strprintf("%d", fraction); frac_str = strprintf("%d", fraction);
config("leadzero", config_leadzero),;
config("tilde", config_tilde),;
/* /*
* determine number of digits in the integer part * determine number of digits in the integer part
@@ -245,7 +253,7 @@ define str_comma(x, group, decimal)
* *
* Skip over the leading 0. in frac_str * Skip over the leading 0. in frac_str
*/ */
ret += substr(frac_str, 3, frac_len-2); ret += substr(frac_str, 2, frac_len-1);
} }
/* /*