units.imperial: adding more units.

diff --git a/extra/units/imperial/imperial.factor b/extra/units/imperial/imperial.factor
index 4b2e617a18f316a47f5f63856bcff051d76318e3..695038d49cd3ab600ecf86db711acb3ca84cfe60 100644 (file)
--- a/extra/units/imperial/imperial.factor
+++ b/extra/units/imperial/imperial.factor
@@ -1,29 +1,51 @@
 USING: kernel math prettyprint units units.si inverse ;
 IN: units.imperial
 
+! LENGTH
+
 : inches ( n -- dimensioned ) 254/100 * cm ;
 
+: thous ( n -- dimensioned ) 1/1000 * inches ;
+
 : feet ( n -- dimensioned ) 12 * inches ;
 
 : yards ( n -- dimensioned ) 3 * feet ;
 
+: miles ( n -- dimensioned ) 1760 * yards ;
+
+: furlongs ( n -- dimensioned ) 1/8 * miles ;
+
+: chains ( n -- dimensioned ) 1/10 * furlongs ;
+
+: leagues ( n -- dimensioned ) 3 * miles ;
+
+: links ( n -- dimensioned ) 1/100 * chains ;
+
+: rods ( n -- dimensioned ) 5+1/2 * yards ;
+
+: barleycorns ( n -- dimensioned ) 1/3 * inches ;
+
+: poppyseeds ( n -- dimensioned ) 1/4 * barleycorns ;
+
+: lines ( n -- dimensioned ) 1/4 * barleycorns ;
+
+: digits ( n -- dimensioned ) 3/4 * inches ;
+
 : hands ( n -- dimensioned ) 4 * inches ;
 
 : palms ( n -- dimensioned ) 3 * inches ;
 
-: nails ( n -- dimensioned ) 1/16 * yards ;
-
-: fingers ( n -- dimensioned ) 1/8 * yards ;
+: shaftments ( n -- dimensioned ) 6 * inches ;
 
-: miles ( n -- dimensioned ) 1760 * yards ;
+: nails ( n -- dimensioned ) 1/16 * yards ;
 
-: furlongs ( n -- dimensioned ) 1/8 * miles ;
+: spans ( n -- dimensioned ) 3 * palms ;
 
-: chains ( n -- dimensioned ) 1/10 * furlongs ;
+: fingers ( n -- dimensioned ) 1/8 * yards ; ! FIXME: or 7/8 * inches?
 
-: links ( n -- dimensioned ) 1/100 * chains ;
+: cubits ( n -- dimensioned ) 18 * inches ;
 
-: rods ( n -- dimensioned ) 11/2 * yards ;
+: ells ( n -- dimensioned ) 1+1/4 * yards ;
 
 ALIAS: poles rods
 
@@ -39,10 +61,46 @@ ALIAS: perches rods
 
 : cables ( n -- dimensioned ) 608 * feet ;
 
+! VOLUME
+
+DEFER: imperial-fluid-ounces
+
+: minims ( n -- dimensioned ) 1/480 imperial-fluid-ounces ;
+
+: apothecary-fluid-scruples ( n -- dimensioned ) 20 * minims ;
+
+: apothecary-fluid-drachms ( n -- dimensioned ) 3 * apothecary-fluid-scruples ;
+
+: apothecary-fluid-ounces ( n -- dimensioned ) 8 * apothecary-fluid-drachms ;
+
+: apothecary-pints ( n -- dimensioned ) 20 * apothecary-fluid-ounces ;
+
+: apothecary-gallons ( n -- dimensioned ) 8 * apothecary-pints ;
+
+! MASS
+
 : pounds ( n -- dimensioned ) 22/10 / kg ;
 
+: drachm ( n -- dimensioned ) 1/256 * pounds ;
+
+: grains ( n -- dimensioned ) 1/7000 * pounds ;
+
 : ounces ( n -- dimensioned ) 1/16 * pounds ;
 
+: nailweights ( n -- dimensioned ) 7 * pounds ;
+
+: stones ( n -- dimensioned ) 14 * pounds ;
+
+: tods ( n -- dimensioned ) 2 * stones ;
+
+: hundredweights ( n -- dimensioned ) 112 * pounds ;
+
+: quarters ( n -- dimensioned ) 1/4 * hundredweights ;
+
+: tons ( n -- dimensioned ) 20 * hundredweights ;
+
+
+
 : gallons ( n -- dimensioned ) 379/100 * L ;
 
 : quarts ( n -- dimensioned ) 1/4 * gallons ;
@@ -53,10 +111,16 @@ ALIAS: perches rods
 
 : us-fluid-ounces ( n -- dimensioned ) 1/16 * pints ;
 
+: drams ( n -- dimensioned ) 1/8 * us-fluid-ounces ;
+
 : teaspoons ( n -- dimensioned ) 1/6 * us-fluid-ounces ;
 
 : tablespoons ( n -- dimensioned ) 1/2 * us-fluid-ounces ;
 
+: ponies ( n -- dimensioned ) 3/4 * us-fluid-ounces ;
+
+: jiggers ( n -- dimensioned ) 1+1/2 * us-fluid-ounces ;
+
 : us-gill ( n -- dimensioned ) 4 * us-fluid-ounces ;
 
 : knots ( n -- dimensioned ) 1852/3600 * m/s ;
@@ -73,6 +137,7 @@ ALIAS: perches rods
 
 : imperial-gill ( n -- dimensioned ) 5 * imperial-fluid-ounces ;
 
+
 : dry-gallons ( n -- dimensioned ) 440488377086/100000000000 * L ; 
 
 : dry-quarts ( n -- dimensioned ) 1/4 * dry-gallons ;
@@ -83,9 +148,38 @@ ALIAS: perches rods
 
 : bushels ( n -- dimensioned ) 4 * pecks ;
 
+: pins ( n -- dimensioned ) 4+1/2 * imperial-gallons ;
+
+: firkins ( n -- dimensioned ) 2 * pins ;
+
+: kilderkins ( n -- dimensioned ) 2 * firkins ;
+
+: beer-barrels ( n -- dimensioned ) 2 * kilderkins ;
+
+: beer-hogsheads ( n -- dimensioned ) 1+1/2 * beer-barrels ;
+
+: beer-butts ( n -- dimensioned ) 2 * beer-hogsheads ;
+
+ALIAS: beer-pipes beer-butts
+
+: beer-tuns ( n -- dimensioned ) 2 * beer-pipes ;
+
+: wine-gallons ( n -- dimensioned ) 18/15 * imperial-gallons ;
+
+: rundlets ( n -- dimensioned ) 18 * wine-gallons ;
+
+: wine-barrels ( n -- dimensioned ) 1+3/4 * rundlets ;
+
+: tierces ( n -- dimensioned ) 1+1/3 * wine-barrels ;
+
+: wine-hogsheads ( n -- dimensioned ) 2 * wine-barrels ;
 
+: wine-punchians ( n -- dimensioned ) 2 * tierces ;
 
+ALIAS: wine-tertians wine-punchians
 
+: wine-butts ( n -- dimensioned ) 2 * wine-hogsheads ;
 
+ALIAS: wine-pipes wine-butts
 
-! rod, hogshead, barrel, peck, metric ton, imperial ton..
+: wine-tun ( n -- dimensioned ) 2 * wine-butts ;