Update source to v6.11.18282.01000

This commit is contained in:
Will Pearson
2018-10-10 22:43:34 +01:00
parent 08ba072313
commit 80b0545f2b
93 changed files with 8784 additions and 2972 deletions

View File

@@ -235,7 +235,7 @@ bool ON_NumberFormatter::FormatNumber(
if (0 != numerator)
{
if(bracket_fractions)
sFormat2.Format(L"[[/%d/%d]]", numerator, denominator);
sFormat2.Format(L"[[%d/%d]]", numerator, denominator);
else
sFormat2.Format(L"%d/%d", numerator, denominator);
sFormat += sFormat2;
@@ -313,14 +313,14 @@ bool ON_NumberFormatter::FormatNumber(
if (wholeinches > 0 || include_feet)
{
if (bracket_fractions)
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);
}
else
{
if (bracket_fractions)
sInches.Format(L"[[/%d/%d]]\"", numerator, denominator);
sInches.Format(L"[[%d/%d]]\"", numerator, denominator);
else
sInches.Format(L"%d/%d\"", numerator, denominator);
}