Sync changes from upstream repository

Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
This commit is contained in:
Bozo The Builder
2022-12-01 15:03:41 -08:00
parent 31c37dea1a
commit 2db8cc1d8a
21 changed files with 1903 additions and 994 deletions

View File

@@ -227,7 +227,9 @@ bool ON_NumberFormatter::FormatNumber(
if (0 != wholenumber)
{
if (0 != numerator)
sFormat.Format(L"%d ", (int)wholenumber);
// RH-71619, removed space
//sFormat.Format(L"%d ", (int)wholenumber);
sFormat.Format(L"%d", (int)wholenumber);
else
sFormat.Format(L"%d", (int)wholenumber);
}
@@ -313,7 +315,9 @@ bool ON_NumberFormatter::FormatNumber(
if (wholeinches > 0 || include_feet)
{
if (bracket_fractions)
sInches.Format(L"%d [[%d/%d]]\"", wholeinches, numerator, denominator);
// RH-71619, removed space
//sInches.Format(L"%d [[%d/%d]]\"", wholeinches, numerator, denominator);
sInches.Format(L"%d[[%d/%d]]\"", wholeinches, numerator, denominator);
else
sInches.Format(L"%d %d/%d\"", wholeinches, numerator, denominator);
}