CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Sun Nov 20 14:53:14 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Extend units.lib with prefixes from Resolution 3 of the 27th meeting of CGPM. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.29 src/usr.bin/units/units.lib:1.30 --- src/usr.bin/units/units.lib:1.29 Mon Oct 24 05:52:48 2022 +++ src/usr.bin/units/units.lib Sun Nov 20 14:53:14 2022 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.29 2022/10/24 05:52:48 dholland Exp $ +/ $NetBSD: units.lib,v 1.30 2022/11/20 14:53:14 jakllsch Exp $ / primitive units @@ -14,6 +14,8 @@ K !j! / prefixes +quetta- 1e30 +ronna- 1e27 yotta- 1e24 zetta- 1e21 exa- 1e18 @@ -35,10 +37,14 @@ femto- 1e-15 atto- 1e-18 zopto- 1e-21 yocto- 1e-24 +ronto- 1e-27 +quecto- 1e-30 semi- .5 demi- .5 +Q- quetta +R- ronna Y- yotta Z- zetta E- exa @@ -57,6 +63,8 @@ f- femto a- atto z- zopto y- yocto +r- ronto +q- quecto / / constants
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Sun Nov 20 14:53:14 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Extend units.lib with prefixes from Resolution 3 of the 27th meeting of CGPM. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: dholland Date: Mon Oct 24 05:52:48 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Some more corrections/additions in units.lib: 1. cables; US cables are 720 ft, but international cables are 1/10 nautical mile and UK Admiralty cables are 1/10 of 1853.2 meters instead of 1852 meters. Make "cable" refer to the international definition, and add "uscable" and "admiraltycable". 2. rods and chains. US rods and chains and furlongs are defined in terms of US survey feet, not international feet. Since the US is apparently working on retiring survey feet, it seems like the best way forward on this is to define two sets of these units, one prefixed with "us". Also since this file was inconsistent about using "survey" vs. "surveyors", fill in more duplicates. Furthermore, Gunter's rods and chains and links are as best I can tell the same as the international ones, so since we already have "gunterschain" add "guntersrod" and "gunterslink". 3. If we're going to make pf a special abbreviation for picofarad, it's reasonable to make uf a special abbreviation for microfarad, and if we're going to define "meg" for "megabyte" we should also have "gig". 4. A "franklin" _is_ a statcoulomb, not an approximation of one. 5. "jewel" has two Es. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.28 src/usr.bin/units/units.lib:1.29 --- src/usr.bin/units/units.lib:1.28 Mon Oct 24 05:04:50 2022 +++ src/usr.bin/units/units.lib Mon Oct 24 05:52:48 2022 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.28 2022/10/24 05:04:50 dholland Exp $ +/ $NetBSD: units.lib,v 1.29 2022/10/24 05:52:48 dholland Exp $ / primitive units @@ -104,7 +104,7 @@ radian .5 / pi degree 1|180 pi-radian circle 2 pi-radian turn 2 pi-radian -revolution turn +revolution turn rev turn grade .9 degree arcdeg 1 degree @@ -291,33 +291,82 @@ league 3 mi mil 1e-3 in / nautical +/ / Historically, the nautical mile was 6080 feet (6080.2 in England) / but was changed to 1852 meters (6076 feet and change) in the 20th / century with varying dates of adoption around the world. / https://en.wikipedia.org/wiki/Nautical_mile +/ +/ The US cable is 720 feet. The international cable is 1/10 nautical +/ mile, which is substantially shorter. The UK Admiralty cable is +/ apparently 1/10 of a historical Admiralty nautical mile, which is +/ 1853.2 instead of 1852 meters. These definitions date from the 20th +/ century. Historically, a cable was 100 fathoms, but the fathom +/ hadn't yet been fixed at 6 feet, so cables weren't a fixed length +/ either. +/ https://en.wikipedia.org/wiki/Cable_(unit) +/ fathom 6 ft nmile 1852 m nauticalmile nmile marineleague 3 nmile -cable 720 ft +cable 1|10 nmile +uscable 720 ft +admiraltycable 185.32 m / surveying / / The US survey foot is defined as 1200/3937 meters, as opposed to the / ordinary international foot, which is 0.3048 meter (that's exactly -/ 2.54 cm to the inch as defined above.) +/ 2.54 cm to the inch as defined above.) These differ slightly. / https://en.wikipedia.org/wiki/Foot_(unit) -rod 5.5 yd -rd rod -perch rd -pole rd -chain 66 ft -link 66|100 ft -furlong 220 yd +/ +/ In the US, rods, chains, and furlongs are defined in terms of survey +/ feet, though the Wikipedia page on furlongs claims without citation +/ that some states use one definition and some the other. However, it +/ appears that as of 2022 this definition is on the way out, and other +/ jurisdictions define these units (to the extent they're used at all) +/ in terms of the international foot. +/ https://en.wikipedia.org/wiki/Rod_(unit) +/ https://en.wikipedia.org/wiki/Furlong_(unit) +/ +/ Consequently we'll make two sets of definitions and prefix the +/ variant US ones with "us". +/ +/ Since historically this file defined "surveyfoot" and "surveyyard" +/ but "surveyorschain" and "surveyorslink", we will now end up with +/ several sets for consistency. +/ surveyfoot 1200|3937 meter surveyyard 3 surveyfoot -surveyorschain 66 ft -surveyorslink 66|100 ft + +rod 5.5 yard +rd rod +perch rod +pole rod +chain 66 foot +link 1|100 chain +furlong 220 yard + +usrod 5.5 surveyyard +usperch usrod +uspole usrod +uschain 66 surveyfoot +uslink 1|100 uschain +usfurlong 220 surveyyard + +surveyorsfoot surveyfoot +surveyorsyard surveyyard +surveyorsrod usrod +surveyorschain uschain +surveyorslink uslink + +/ These are the same as the basic ones based on the international foot. +/ https://en.wikipedia.org/wiki/Gunter's_chain +/ https://en.wikipedia.org/wiki/Imperial_units +guntersrod rod +gunterschain chain +gunterslink link / typographical pica 1|6 in @@ -363,7
CVS commit: src/usr.bin/units
Module Name:src Committed By: dholland Date: Mon Oct 24 05:52:48 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Some more corrections/additions in units.lib: 1. cables; US cables are 720 ft, but international cables are 1/10 nautical mile and UK Admiralty cables are 1/10 of 1853.2 meters instead of 1852 meters. Make "cable" refer to the international definition, and add "uscable" and "admiraltycable". 2. rods and chains. US rods and chains and furlongs are defined in terms of US survey feet, not international feet. Since the US is apparently working on retiring survey feet, it seems like the best way forward on this is to define two sets of these units, one prefixed with "us". Also since this file was inconsistent about using "survey" vs. "surveyors", fill in more duplicates. Furthermore, Gunter's rods and chains and links are as best I can tell the same as the international ones, so since we already have "gunterschain" add "guntersrod" and "gunterslink". 3. If we're going to make pf a special abbreviation for picofarad, it's reasonable to make uf a special abbreviation for microfarad, and if we're going to define "meg" for "megabyte" we should also have "gig". 4. A "franklin" _is_ a statcoulomb, not an approximation of one. 5. "jewel" has two Es. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: dholland Date: Mon Oct 24 05:04:51 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: units.lib: fix "surveyfoot" and kill off "british". The US survey foot is defined as 1200/3937 of a meter, whereas the ordinary international foot is 0.3048 meter. These are almost, but not quite the same. Define the survey foot this way instead of defining an adjective unit for the conversion, which is much less confusing even if the adjective unit had a reasonable name. For the time being the fact that it was called "british" remains thoroughly obscure. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.27 src/usr.bin/units/units.lib:1.28 --- src/usr.bin/units/units.lib:1.27 Mon Oct 24 04:55:19 2022 +++ src/usr.bin/units/units.lib Mon Oct 24 05:04:50 2022 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.27 2022/10/24 04:55:19 dholland Exp $ +/ $NetBSD: units.lib,v 1.28 2022/10/24 05:04:50 dholland Exp $ / primitive units @@ -290,8 +290,6 @@ mi mile league 3 mi mil 1e-3 in -british 1200|3937 m/ft - / nautical / Historically, the nautical mile was 6080 feet (6080.2 in England) / but was changed to 1852 meters (6076 feet and change) in the 20th @@ -304,6 +302,11 @@ marineleague 3 nmile cable 720 ft / surveying +/ +/ The US survey foot is defined as 1200/3937 meters, as opposed to the +/ ordinary international foot, which is 0.3048 meter (that's exactly +/ 2.54 cm to the inch as defined above.) +/ https://en.wikipedia.org/wiki/Foot_(unit) rod 5.5 yd rd rod perch rd @@ -311,7 +314,7 @@ pole rd chain 66 ft link 66|100 ft furlong 220 yd -surveyfoot british-ft +surveyfoot 1200|3937 meter surveyyard 3 surveyfoot surveyorschain 66 ft surveyorslink 66|100 ft @@ -356,7 +359,7 @@ englishell 45 inch rood 1.21e+3 yd / other -geodeticfoot british-ft +geodeticfoot surveyfoot geographicalmile 1852 m engineerschain 100 ft engineerslink 100|100 ft
CVS commit: src/usr.bin/units
Module Name:src Committed By: dholland Date: Mon Oct 24 05:04:51 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: units.lib: fix "surveyfoot" and kill off "british". The US survey foot is defined as 1200/3937 of a meter, whereas the ordinary international foot is 0.3048 meter. These are almost, but not quite the same. Define the survey foot this way instead of defining an adjective unit for the conversion, which is much less confusing even if the adjective unit had a reasonable name. For the time being the fact that it was called "british" remains thoroughly obscure. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: dholland Date: Mon Oct 24 04:55:19 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Reorganize units.lib. It's all very well to file miscellaneous old units under "trivia" but it's more useful to sort first by type and then by creakiness. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.26 src/usr.bin/units/units.lib:1.27 --- src/usr.bin/units/units.lib:1.26 Tue Feb 15 16:21:35 2022 +++ src/usr.bin/units/units.lib Mon Oct 24 04:55:19 2022 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.26 2022/02/15 16:21:35 jakllsch Exp $ +/ $NetBSD: units.lib,v 1.27 2022/10/24 04:55:19 dholland Exp $ / primitive units @@ -58,21 +58,47 @@ a- atto z- zopto y- yocto +/ / constants fuzz 1 + pi 3.14159265358979323846 c 2.99792458e+8 m/sec fuzz -g 9.80665 m/sec2 -au 1.49597871e+11 m fuzz -mole 6.022169e+23 fuzz e 1.6021917e-19 coul fuzz +k 1.38047e-16 erg/degC +planck 6.626e-34 joule-sec +hbar 1.055e-34 joule-sec +mole 6.022169e+23 fuzz + +g 9.80665 m/sec2 + +/ conversion factors used as adjectives energy c2 force g mercury 1.33322e+5 kg/m2-sec2 hg mercury -/ dimensionless +/ standard ratios +% 1|100 +percent % +/ proof is specific to alcohol concentration +proof 1|200 + +/ +/ counts + +dozen 12 +bakersdozen 13 +score 20 +gross 144 + +/ quire and ream are specific to counting sheets of paper +quire 25 +ream 500 + +/ +/ angles radian .5 / pi degree 1|180 pi-radian @@ -83,17 +109,32 @@ rev turn grade .9 degree arcdeg 1 degree arcmin 1|60 arcdeg -ccs 1|36 erlang arcsec 1|60 arcmin +centesimalminute 1e-2 grade +centesimalsecond 1e-4 grade + +/ +/ solid angles + steradian radian2 sphere 4 pi-steradian sr steradian +spat 4 pi sr +/ / Time +/ SI unit second sec s sec + +/ special-case abbreviations +ms millisec +ns nanosec +us microsec + +/ civil timekeeping minute 60 sec min minute hour 60 min @@ -101,53 +142,142 @@ hr hour day 24 hr da day week 7 day +fortnight 14 da +month 1|12 year +mo month year 365.24219879 day fuzz yr year -month 1|12 year -ms millisec -us microsec +decade 10 yr +century 100 year +millennium 1000 year + +/ astronomical details +siderealyear 365.256360417 day +siderealday 23.934469444 hour +siderealhour 1|24 siderealday +lunarmonth 29.530 day +synodicmonth lunarmonth +siderealmonth 27.32152777 day +tropicalyear year +solaryear year +lunaryear 12 lunarmonth + +/ misc +sigma microsec + +/ +/ Frequency + +hertz /sec +Hz hertz +hz /sec +khz 1e+3 /sec +mhz 1e+6 /sec +rpm rev/minute +rps rev/sec + +fresnel 1e12 hertz +pulsatance 2 pi/sec -/ Mass +/ +/ Mass and weight gram millikg +gramme gram gm gram mg milligram metricton kilokg +tonne 1e+6 gm + +atomicmassunit 1.66044e-27 kg fuzz +amu atomicmassunit +dalton amu + +electronmass 9.1095e-31 kg +protonmass 1.6726e-27 kg +neutronmass 1.6606e-27 kg + +carat 205 mg +metriccarat 200 mg +quintal 100 kg -/ Avoirdupois +/ Avoirdupois weight lb .45359237 kg pound lb -lbf lb g ounce 1|16 lb oz ounce dram 1|16 oz dr dram grain 1|7000 lb gr grain +stone 14 lb shortton 2000 lb ton shortton longton 2240 lb -/ Apothecary +bag 94 lb +cental 100 lb +longhundredweight 112 lb +longquarter 28 lb +pennyweight 1|20 oz +pwt pennyweight +shorthundredweight 100 lb +shortquarter 25 lb +weymass 252 lb + +/ Related mass units +/ +/ According to Wikipedia there are two definitions for hyl, one using +/ grams and one using kilograms. beware + +hyl gm force sec2/m +slug lb-g-sec2/ft + +/ Apothecary weight scruple 20 grain apdram 60 grain +drachm 60 grain apounce 480 grain appound 5760 grain troypound appound troyounce 1|12 troypound +/ Thai weight + +salueng 3.75 gm +baht 4 salueng +tamlueng 4 baht +chang 20 tamlueng +hap 50 chang + +/ / Length +/ SI unit meter m +metre meter + +/ special-case abbreviations cm centimeter mm millimeter km kilometer nm nanometer -micron micrometer + +/ other metric units angstrom decinanometer +fermi
CVS commit: src/usr.bin/units
Module Name:src Committed By: dholland Date: Mon Oct 24 04:55:19 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Reorganize units.lib. It's all very well to file miscellaneous old units under "trivia" but it's more useful to sort first by type and then by creakiness. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Tue Feb 15 16:21:35 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Define becquerels in base units (like curies and rutherfords already are), rather than in terms of curies. Add symbol Bq for becquerel. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.25 src/usr.bin/units/units.lib:1.26 --- src/usr.bin/units/units.lib:1.25 Tue Feb 15 13:44:47 2022 +++ src/usr.bin/units/units.lib Tue Feb 15 16:21:35 2022 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.25 2022/02/15 13:44:47 jakllsch Exp $ +/ $NetBSD: units.lib,v 1.26 2022/02/15 16:21:35 jakllsch Exp $ / primitive units @@ -612,7 +612,8 @@ neutronmass 1.6606e-27 kg V volt eV e V bohrradius hbar2-C2/8.988e9 N m2-e2-electronmass -becquerel 1|3.7e10 curie +becquerel /sec +Bq becquerel fresnel 1e12 hertz statcoul 1|2.99792458e9 coul statamp 1|2.99792458e9 amp
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Tue Feb 15 16:21:35 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: Define becquerels in base units (like curies and rutherfords already are), rather than in terms of curies. Add symbol Bq for becquerel. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Tue Feb 15 13:44:47 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: fix inconsistent whitespace in units.lib To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/units/units.lib diff -u src/usr.bin/units/units.lib:1.24 src/usr.bin/units/units.lib:1.25 --- src/usr.bin/units/units.lib:1.24 Thu Apr 23 09:38:17 2020 +++ src/usr.bin/units/units.lib Tue Feb 15 13:44:47 2022 @@ -1,4 +1,4 @@ -/ $NetBSD: units.lib,v 1.24 2020/04/23 09:38:17 kre Exp $ +/ $NetBSD: units.lib,v 1.25 2022/02/15 13:44:47 jakllsch Exp $ / primitive units @@ -271,7 +271,7 @@ denmarkkrone .15 $ ecuadorsucre .000539 $ europeeuro 0.9142 $ greatbritainpound britainpound -hongkongdollar .13 $ +hongkongdollar .13 $ hungaryforint .011 $ indiarupee .03211 $ indonesiarupiah .0004782 $ @@ -292,7 +292,7 @@ polandzloty .59 $ saudiarabiariyal .26702 $ singaporedollar .6157 $ slovakkoruna .034 $ -southafricarand .21 $ +southafricarand .21 $ southkoreawon .001 $ swedenkrona .13 $ switzerlandfranc .66 $
CVS commit: src/usr.bin/units
Module Name:src Committed By: jakllsch Date: Tue Feb 15 13:44:47 UTC 2022 Modified Files: src/usr.bin/units: units.lib Log Message: fix inconsistent whitespace in units.lib To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/usr.bin/units/units.lib Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.bin/units
Date:Fri, 28 Dec 2012 17:57:46 + From:Alan Barrett a...@netbsd.org Message-ID: 20121228175746.e19f117...@cvs.netbsd.org | because unit names cannot contain hyphens. Should that not be mentioned in the man page? Perhaps together with a suggestion that if the name the user requires should have hyphens, it simply be entered with the hyphens deleted ... perhaps even using tappit-hen as an example. kre
Re: CVS commit: src/usr.bin/units
On Sat, 29 Dec 2012, Robert Elz wrote: | because unit names cannot contain hyphens. Should that not be mentioned in the man page? Perhaps together with a suggestion that if the name the user requires should have hyphens, it simply be entered with the hyphens deleted ... perhaps even using tappit-hen as an example. Good idea. --apb (Alan Barrett)
Re: CVS commit: src/usr.bin/units
On Apr 3, 2011, at 12:44, David A. Holland wrote: Module Name: src Committed By: dholland Date: Sun Apr 3 19:44:15 UTC 2011 Modified Files: src/usr.bin/units: units.1 Log Message: Expand user warning (adding examples) and move to CAVEATS as it's not fixable. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/units/units.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Traditionally, BUGS was the section for that ... Erik f...@clock.org
