summaryrefslogtreecommitdiff
path: root/src/main/resources/unitsfile.txt
diff options
context:
space:
mode:
authorAdrien Hopkins <adrien.p.hopkins@gmail.com>2025-06-15 19:42:01 -0500
committerAdrien Hopkins <adrien.p.hopkins@gmail.com>2025-06-15 19:42:01 -0500
commit2fdbc084fd1d78f0b7633db34460b1195de264f3 (patch)
tree4c908950d9b049394f8160b8159b498aec586ecc /src/main/resources/unitsfile.txt
parented53492243ecad8d975401a97f5b634328ad2c71 (diff)
parentbccb5b5e3452421c81c1fb58f83391ba6584807c (diff)
Merge release 1.0.0 into stable branchHEADstable
See the tag 'v1.0.0' or the changelog for more information about this release.
Diffstat (limited to 'src/main/resources/unitsfile.txt')
-rw-r--r--src/main/resources/unitsfile.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/resources/unitsfile.txt b/src/main/resources/unitsfile.txt
index 543c821..17fe98a 100644
--- a/src/main/resources/unitsfile.txt
+++ b/src/main/resources/unitsfile.txt
@@ -155,6 +155,7 @@ minute 60 second
min minute
hour 3600 second
h hour
+hms hour; minute; second
day 86400 second
d day
week 7 day
@@ -164,6 +165,7 @@ gregorianyear 365.2425 day
gregorianmonth gregorianyear / 12
# Other non-SI "metric" units
+are 100 m^2
litre 0.001 m^3
liter litre
l litre
@@ -187,8 +189,16 @@ inch foot / 12
in inch
yard 3 foot
yd yard
+chain 66 ft
+ch chain
+furlong 10 chain
mile 1760 yard
mi mile
+ftin ft; in
+ydftin yd; ft; in
+
+# Imperial area units
+acre chain * furlong
# Compressed notation
kph km / hour