Merge pull request #756 from denehoffman/master

Author: Goju-Ryu

book/src/list-units.md

@@ -223,9 +223,9 @@ and — where sensible — units allow for [binary prefixes](https://en.wikipedi
 | `Volume` | [UK tablespoon](https://en.wikipedia.org/wiki/Tablespoon) | `imperial_tablespoon`, `UK_tablespoon`, `UK_tablespoons`, `UK_tbsp` |
 | `Volume` | [UK teaspoon](https://en.wikipedia.org/wiki/Teaspoon) | `imperial_teaspoon`, `imperial_teaspoons`, `UK_teaspoon`, `UK_teaspoons`, `UK_tsp` |
 | `Volume` | [Litre](https://en.wikipedia.org/wiki/Litre) | `l`, `L`, `liter`, `liters`, `litre`, `litres` |
+| `Volume` | [Metric tablespoon](https://en.wikipedia.org/wiki/Tablespoon) | `metric_tablespoon`, `metric_tablespoons`, `metric_tbsp` |
+| `Volume` | [Metric teaspoon](https://en.wikipedia.org/wiki/Teaspoon) | `metric_teaspoon`, `metric_teaspoons`, `metric_tsp` |
 | `Volume` | [US liquid pint](https://en.wikipedia.org/wiki/Pint) | `pint`, `pints` |
 | `Volume` | [Swimming pool](https://en.wikipedia.org/wiki/Olympic-size_swimming_pool) | `swimmingpool` |
-| `Volume` | [Metric tablespoon](https://en.wikipedia.org/wiki/Tablespoon) | `tablespoon`, `tablespoons`, `tbsp` |
-| `Volume` | [Metric teaspoon](https://en.wikipedia.org/wiki/Teaspoon) | `teaspoon`, `teaspoons`, `tsp` |
-| `Volume` | [US tablespoon](https://en.wikipedia.org/wiki/Tablespoon) | `US_tablespoon`, `US_tablespoons`, `US_tbsp` |
-| `Volume` | [US teaspoon](https://en.wikipedia.org/wiki/Teaspoon) | `US_teaspoon`, `US_teaspoons`, `US_tsp` |
+| `Volume` | [US tablespoon](https://en.wikipedia.org/wiki/Tablespoon) | `tablespoon`, `tablespoons`, `tbsp` |
+| `Volume` | [US teaspoon](https://en.wikipedia.org/wiki/Teaspoon) | `teaspoon`, `teaspoons`, `tsp` |

examples/tests/unit_consistency_misc.nbt

@@ -17,15 +17,16 @@ assert_eq(1 gregorian_year, 365.2425 day)
 assert_eq(1 julian_year, 365.25 day)
 assert_eq(1 year, 1 tropical_year)
 
-assert_eq(1 teaspoon, 5 mL, 1e-5 teaspoon)
+assert_eq(1 metric_teaspoon, 5 mL, 1e-5 metric_teaspoon)
+assert_eq(1 teaspoon, 4.92892159375 mL, 1e-5 teaspoon)
 assert_eq(3 teaspoon, 1 tablespoon, 1e-5 teaspoon)
 
 assert_eq(1 gallon, 231 inch³, 1e-5 inch³)
 assert_eq(8 pint, 1 gallon)
 assert_eq(2 cup, 1 pint)
-assert_eq(16 US_tablespoon, 1 cup)
-assert_eq(3 US_teaspoon, 1 US_tablespoon, 1e-5 US_teaspoon)
-assert_eq(1 floz, 2 US_tablespoon)
+assert_eq(16 tablespoon, 1 cup)
+assert_eq(3 teaspoon, 1 tablespoon, 1e-5 teaspoon)
+assert_eq(1 floz, 2 tablespoon)
 assert_eq(1 hogshead, 63 gallon)
 assert_eq(1 rod, 16.5 foot)
 

numbat/modules/units/misc.nbt

@@ -176,10 +176,10 @@ unit fermi: Length = 1 fm
 
 @name("Metric tablespoon")
 @url("https://en.wikipedia.org/wiki/Tablespoon")
-@aliases(tablespoons, tbsp: short)
-unit tablespoon: Volume = 15 mL
+@aliases(metric_tablespoons, metric_tbsp: short)
+unit metric_tablespoon: Volume = 15 mL
 
 @name("Metric teaspoon")
 @url("https://en.wikipedia.org/wiki/Teaspoon")
-@aliases(teaspoons, tsp: short)
-unit teaspoon: Volume = 1/3 × tablespoon
+@aliases(metric_teaspoons, metric_tsp: short)
+unit metric_teaspoon: Volume = 1/3 × metric_tablespoon

numbat/modules/units/us_customary.nbt

@@ -18,18 +18,18 @@ unit cup: Volume = 1/2 × pint
 
 @name("US tablespoon")
 @url("https://en.wikipedia.org/wiki/Tablespoon")
-@aliases(US_tablespoons, US_tbsp: short)
-unit US_tablespoon: Volume = 1/16 × cup
+@aliases(tablespoons, tbsp: short)
+unit tablespoon: Volume = 1/16 × cup
 
 @name("US teaspoon")
 @url("https://en.wikipedia.org/wiki/Teaspoon")
-@aliases(US_teaspoons, US_tsp: short)
-unit US_teaspoon: Volume = 1/3 × US_tablespoon
+@aliases(teaspoons, tsp: short)
+unit teaspoon: Volume = 1/3 × tablespoon
 
 @name("US fluid ounce")
 @url("https://en.wikipedia.org/wiki/Fluid_ounce")
 @aliases(fluidounces, floz: short)
-unit fluidounce: Volume = 2 US_tablespoon
+unit fluidounce: Volume = 2 tablespoon
 
 @name("US hogshead")
 @url("https://en.wikipedia.org/wiki/Hogshead")