(in preparation for some currency updates)

sync the list from the federal reserve, to match exactly what they
currently publish. to do that, i've changed the base currency for the UK
from "britainpound" to "unitedkingdompound"; and for China from "chinarenminbi"
to "chinayuan".

to preserve those long existing terms, i've added aliases for
"greatbritainpound", "britainpound", and "chinarenminbi".

i've also sorted the federal reserve list to match the order currently
published.

1 files changed, 8 insertions, 7 deletions

diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index 68d0d2a16c7..70ce08f1a17 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $OpenBSD: units.lib,v 1.12 2010/10/16 00:44:42 tedu Exp $
+/ $OpenBSD: units.lib,v 1.13 2011/09/30 16:21:00 jmc Exp $
 / $NetBSD: units.lib,v 1.3 1996/04/06 06:01:04 thorpej Exp $
 
 / primitive units
@@ -288,12 +288,10 @@ lux			cd sr/m2
 $			dollar
 australiadollar		.5645 $
 brazilreal		.3981 $
-britainpound		1.4655 $
 canadadollar		.652 $
-chinarenminbi		.1208 $
-chinayuan		chinarenminbi
+chinayuan		.1208 $
 denmarkkrone		.126 $
-greatbritainpound	britainpound
+euro			0.937 $
 hongkongdollar		.13  $
 indiarupee		.0204 $
 japanyen		.0081 $
@@ -309,8 +307,8 @@ swedenkrona		.1029 $
 switzerlandfranc	.64 $
 taiwandollar		.0294 $
 thailandbaht		.02357 $
+unitedkingdompound	1.4655 $
 venezuelabolivar	.00086 $
-euro			0.937 $
 
 / Wall Street Journal, May 30 2002
 
@@ -366,7 +364,10 @@ drachma			greecedrachma
 franc			francefranc
 markka			finlandmarkka
 sucre			ecuadorsucre
-poundsterling		britainpound
+poundsterling		unitedkingdompound
+greatbritainpound	unitedkingdompound
+britainpound		unitedkingdompound
+chinarenminbi		chinayuan
 
 / ISO 4217 and then some
 AED			unitedarabdirham