Refactor Num_Number to NumForm, including range for 20..99

Introduce a couple of errors in numerals:
test/run.php numerals/numerals
 92 linearisations total: 92 correct, 0 incorrect.

test/run.php numerals/numerals2
 156 linearisations total: 136 correct, 20 incorrect.