Merge pull request #139 from gwatt/format-twelfth

Write "twelfth" instead of "twelveth" in format
original commit: 76bbdec142cedd2a39df4aff81815a039def7658
This commit is contained in:
Andy Keep 2017-01-19 20:45:27 -05:00 committed by GitHub
commit c2b7aa8dcb
3 changed files with 3 additions and 2 deletions

1
LOG
View File

@ -326,3 +326,4 @@
bfp to instead key off of both the bfp and efp.
pdhtml.ss
- added Windows installer using the WiX Toolset
- fix typo in ordinal format for 12

View File

@ -667,7 +667,7 @@
(equal? (format "~:r ~:r ~:r ~:r ~:r ~:r ~:r ~:r ~:r ~:r" 0 1 2 3 4 5 6 7 8 9)
"zeroth first second third fourth fifth sixth seventh eighth ninth")
(equal? (format "~:r ~:r ~:r ~:r ~:r ~:r ~:r ~:r ~:r ~:r" 10 11 12 13 14 15 16 17 18 19)
"tenth eleventh twelveth thirteenth fourteenth fifteenth sixteenth seventeenth eighteenth nineteenth")
"tenth eleventh twelfth thirteenth fourteenth fifteenth sixteenth seventeenth eighteenth nineteenth")
)
(mat format-fixed1

View File

@ -1011,7 +1011,7 @@
(define v20 '#(#f #f twenty thirty forty fifty sixty seventy eighty ninety))
(define v0 '#(zero one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen sixteen seventeen eighteen nineteen))
(define *v20 '#(#f #f twentieth thirtieth fortieth fiftieth sixtieth seventieth eightieth ninetieth))
(define *v0 '#(zeroth first second third fourth fifth sixth seventh eighth ninth tenth eleventh twelveth thirteenth fourteenth fifteenth sixteenth seventeenth eighteenth nineteenth))
(define *v0 '#(zeroth first second third fourth fifth sixth seventh eighth ninth tenth eleventh twelfth thirteenth fourteenth fifteenth sixteenth seventeenth eighteenth nineteenth))
(define (write-ordinal x op)
(if (<= -999999999 x +999999999)
(if (< x 0)