[udunits] 01/01: upstream 2.2.19
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Jun 15 09:22:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag upstream_2.2.19
in repository udunits.
commit e43a03b246b74b67c276930c70411f56a1cb27d0
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon May 4 15:06:30 2015 +0100
upstream 2.2.19
---
CHANGE_LOG | 74 ++++---
CMakeLists.txt | 2 +-
configure | 20 +-
configure.ac | 2 +-
lib/Makefile.am | 1 +
lib/Makefile.in | 28 +--
lib/converter.c | 13 +-
lib/idToUnitMap.c | 5 +-
lib/scanner.c | 3 +
lib/udunits2-accepted.xml | 66 ++++--
lib/udunits2-base.xml | 45 +---
lib/udunits2-common.xml | 551 ++++++++++++++++++++++++++++++++++++----------
lib/udunits2-derived.xml | 93 +++++---
lib/udunits2-prefixes.xml | 4 +-
lib/udunits2lib.pdf | Bin 270660 -> 270660 bytes
lib/unitToIdMap.c | 13 +-
lib/unitcore.c | 1 +
lib/xml.c | 7 +-
prog/Makefile.am | 3 +
prog/Makefile.in | 12 +-
prog/udunits2.c | 34 +--
prog/udunits2prog.pdf | Bin 71512 -> 71512 bytes
stamp-vti | 8 +-
udunits2.html | 10 +-
udunits2.info | 37 ++--
udunits2.pdf | Bin 118044 -> 117913 bytes
version.texi | 8 +-
27 files changed, 726 insertions(+), 314 deletions(-)
diff --git a/CHANGE_LOG b/CHANGE_LOG
index c86f250..1655a9f 100644
--- a/CHANGE_LOG
+++ b/CHANGE_LOG
@@ -1,4 +1,28 @@
-2.2.17 2014-09-02T11:14:40-0600
+2.2.19
+ Added `tsearch.c` and `tsearch.h` to the distribution to support building
+ on Windows.
+
+2.2.18 2015-04-02T10:32:50-0600
+ Library (udunits2(3)):
+ Eliminated the use of <unistd.h> on Windows.
+
+ Improved support for static builds.
+
+ Units Database:
+ Corrected the definition of "dram" and added "fluid_dram".
+
+ Changed the definition of "molecule" to "1/avogadro_constant".
+
+ Added comments and human-readable definitions.
+ Improved support for static builds.
+
+ Program (udunits2(1)):
+ Removed latent bug on Windows in determining the name of the program.
+
+ Misc:
+ Removed lint discovered by Coverity.
+
+2.2.17 2014-11-18T11:32:32-0700
Modified the lexical scanner to accept the use of "ref" in an offset
time-unit specification (e.g., "seconds ref 1970-01-01") in order to be
compatible with version 2.1. Added concomitant test to unit-tests.
@@ -103,6 +127,30 @@
Added scripts and configuration-files to support continuous-delivery.
+ Units Database:
+ Added units "molecule" (for conversion with "mole") and "bit".
+
+ Misc:
+ Removed bundled EXPAT package.
+
+ Ported code to 32-bit Windows-7 under MinGW.
+
+ Added explicit chapters on the unit utility and unit library to the
+ top-level package documentation.
+
+ Bug Fixes:
+ Library udunits2(3):
+ Corrected logic of checking for location of <noplural> element.
+
+ Units Database:
+ Corrected ISO Latin-1 encodings that somehow got corrupted.
+
+ Release Engineering:
+ Added support for building by CMake and for creating binary
+ distributions by CPack.
+
+ Added scripts and configuration-files to support continuous-delivery.
+
Added acceptance-test scripts for 32-bit Ubuntu 12 (Precise Pangolin)
and 32-bit Windows-7. Currently, only the Ubuntu script is used in the
continuous-delivery pipeline.
@@ -281,30 +329,6 @@
2.1.4 2009-03-24
Documented the change in meaning of the symbol "g" from the
original package (standard free fall) to this package (gram).
-
- Returned HP-UX to the set of tested operating systems.
-
-2.1.3 2009-03-23
- Corrected typos in XML units database for "US_survey_foot" and
- "international_foot": removed embedded quotation marks.
-
-2.1.2 2009-03-19
- Corrected program udunits2(1): it now correctly parses units
- like "0.1 lg(re 1.0e-12 W.m-2)".
-
- Made the dimensionless unit one format as "1".
-
- Corrected rule for target "web-update": changed "distname" to
- "distName".
-
- Corrected the development make(1) target "hostcheck": added
- setting of MAKEFLAGS to the empty string before invoking
- make(1).
-
-2.1.1 2009-03-13
- Corrected and improved the development make(1) targets "ftp"
- and "download-update".
-
Added publication of the XML database on the UDUNITS website to
the target "web-update".
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b833859..1dfbc4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(VERSION_MAJOR 2)
SET(VERSION_MINOR 2)
-SET(VERSION_PATCH 17)
+SET(VERSION_PATCH 19)
# Ensure a path in the format common to both Unix and MinGW.
FUNCTION(to_common_path input result)
diff --git a/configure b/configure
index 7d85ced..679da8b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for UDUNITS 2.2.17.
+# Generated by GNU Autoconf 2.68 for UDUNITS 2.2.19.
#
# Report bugs to <support-udunits at unidata.ucar.edu>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='UDUNITS'
PACKAGE_TARNAME='udunits'
-PACKAGE_VERSION='2.2.17'
-PACKAGE_STRING='UDUNITS 2.2.17'
+PACKAGE_VERSION='2.2.19'
+PACKAGE_STRING='UDUNITS 2.2.19'
PACKAGE_BUGREPORT='support-udunits at unidata.ucar.edu'
PACKAGE_URL=''
@@ -1310,7 +1310,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures UDUNITS 2.2.17 to adapt to many kinds of systems.
+\`configure' configures UDUNITS 2.2.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1380,7 +1380,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of UDUNITS 2.2.17:";;
+ short | recursive ) echo "Configuration of UDUNITS 2.2.19:";;
esac
cat <<\_ACEOF
@@ -1493,7 +1493,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-UDUNITS configure 2.2.17
+UDUNITS configure 2.2.19
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2000,7 +2000,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by UDUNITS $as_me 2.2.17, which was
+It was created by UDUNITS $as_me 2.2.19, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2817,7 +2817,7 @@ fi
# Define the identity of the package.
PACKAGE='udunits'
- VERSION='2.2.17'
+ VERSION='2.2.19'
cat >>confdefs.h <<_ACEOF
@@ -15896,7 +15896,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by UDUNITS $as_me 2.2.17, which was
+This file was extended by UDUNITS $as_me 2.2.19, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15962,7 +15962,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-UDUNITS config.status 2.2.17
+UDUNITS config.status 2.2.19
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ad119ca..7bab3c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@
#
AC_PREREQ(2.59)
-AC_INIT(UDUNITS, 2.2.17, support-udunits at unidata.ucar.edu)
+AC_INIT([UDUNITS], [2.2.19], [support-udunits at unidata.ucar.edu])
AC_CONFIG_SRCDIR([lib/converter.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index db0e9d6..3863e81 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,6 +7,7 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = xmlFailures xmlSuccesses
lib_LTLIBRARIES = libudunits2.la
+EXTRA_DIST = tsearch.c tsearch.h
libudunits2_la_SOURCES = unitcore.c converter.c formatter.c \
idToUnitMap.c idToUnitMap.h \
unitToIdMap.c unitToIdMap.h \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 0469fe8..33fa2d9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -315,6 +315,20 @@ top_srcdir = @top_srcdir@
#
SUBDIRS = xmlFailures xmlSuccesses
lib_LTLIBRARIES = libudunits2.la
+EXTRA_DIST = \
+ CMakeLists.txt \
+ parser.c \
+ scanner.l \
+ scanner.c \
+ udunits2.xml \
+ udunits2-accepted.xml \
+ udunits2-base.xml \
+ udunits2-common.xml \
+ udunits2-derived.xml \
+ udunits2-prefixes.xml \
+ udunits2lib.html \
+ udunits2lib.pdf
+
libudunits2_la_SOURCES = unitcore.c converter.c formatter.c \
idToUnitMap.c idToUnitMap.h unitToIdMap.c unitToIdMap.h \
unitAndId.c unitAndId.h systemMap.c systemMap.h prefix.c \
@@ -339,20 +353,6 @@ libudunits2_la_LDFLAGS = -version-number 0:1:0
lex_prefix = ut
LFLAGS = -d -P$(lex_prefix)
include_HEADERS = udunits2.h converter.h $(am__append_2)
-EXTRA_DIST = \
- CMakeLists.txt \
- parser.c \
- scanner.l \
- scanner.c \
- udunits2.xml \
- udunits2-accepted.xml \
- udunits2-base.xml \
- udunits2-common.xml \
- udunits2-derived.xml \
- udunits2-prefixes.xml \
- udunits2lib.html \
- udunits2lib.pdf
-
AM_YFLAGS = -t -p ut
@HAVE_CUNIT_FALSE at LDADD = @LIBS@
@HAVE_CUNIT_TRUE at LDADD = \
diff --git a/lib/converter.c b/lib/converter.c
index 5a22c3c..c67b345 100644
--- a/lib/converter.c
+++ b/lib/converter.c
@@ -905,7 +905,7 @@ compositeGetExpression(
buf[max-1] = 0;
if (cvNeedsParentheses(buf)) {
- nchar = snprintf(tmpBuf, sizeof(tmpBuf), "(%s)", buf);
+ (void)snprintf(tmpBuf, sizeof(tmpBuf), "(%s)", buf);
}
else {
(void)strncpy(tmpBuf, buf, sizeof(tmpBuf));
@@ -1055,13 +1055,12 @@ cv_get_galilean(
conv = cv_get_scale(slope);
}
else {
- cv_converter* tmp = malloc(sizeof(GalileanConverter));
+ conv = malloc(sizeof(GalileanConverter));
- if (tmp != NULL) {
- tmp->ops = &galileanOps;
- tmp->galilean.slope = slope;
- tmp->galilean.intercept = intercept;
- conv = tmp;
+ if (conv != NULL) {
+ conv->ops = &galileanOps;
+ conv->galilean.slope = slope;
+ conv->galilean.intercept = intercept;
}
}
diff --git a/lib/idToUnitMap.c b/lib/idToUnitMap.c
index f2d04b0..b608eaf 100644
--- a/lib/idToUnitMap.c
+++ b/lib/idToUnitMap.c
@@ -128,7 +128,10 @@ itumAdd(
targetEntry = uaiNew(unit, id);
- if (targetEntry != NULL) {
+ if (targetEntry == NULL) {
+ status = ut_get_status();
+ }
+ else {
UnitAndId** treeEntry = tsearch(targetEntry, &map->tree,
map->compare);
diff --git a/lib/scanner.c b/lib/scanner.c
index 3206518..18103d7 100644
--- a/lib/scanner.c
+++ b/lib/scanner.c
@@ -1038,6 +1038,9 @@ static int decodeReal(
#define DATE_SEEN 3
#define CLOCK_SEEN 4
+#ifdef WIN32
+#define YY_NO_UNISTD_H
+#endif
#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
* down here because we want the user's section 1 to have been scanned first.
diff --git a/lib/udunits2-accepted.xml b/lib/udunits2-accepted.xml
index acf8589..784051e 100644
--- a/lib/udunits2-accepted.xml
+++ b/lib/udunits2-accepted.xml
@@ -14,87 +14,97 @@ Units accepted for use with the SI
<def>60 s</def>
<name><singular>minute</singular></name>
<symbol>min</symbol>
+ <definition>period of time equal to 60 seconds</definition>
</unit>
<unit>
<def>60 min</def>
<name><singular>hour</singular></name>
<symbol>h</symbol>
<aliases> <symbol>hr</symbol> </aliases>
+ <definition>period of time equal to 60 minutes</definition>
</unit>
<unit>
<def>24 h</def>
<name><singular>day</singular></name>
<symbol>d</symbol>
+ <definition>period of time equal to 24 hours</definition>
</unit>
<unit>
- <!-- This "unit" is useful in the definition of subsequent
- units. -->
+ <comment>This "unit" is useful in the definition of subsequent units.</comment>
<def>3.141592653589793238462643383279</def>
<aliases>
<name><singular>pi</singular><noplural/></name>
- <symbol>π</symbol> <!-- GREEK SMALL LETTER PI -->
+ <symbol comment="GREEK SMALL LETTER PI">π</symbol>
</aliases>
+ <definition>mathematical constant equal to the ratio of a circle's circumference to its diameter</definition>
</unit>
<unit>
<def>(pi/180) rad</def>
<name><singular>arc_degree</singular></name>
- <symbol>°</symbol> <!-- DEGREE SIGN -->
+ <symbol comment="DEGREE SIGN">°</symbol>
<aliases>
<name><singular>angular_degree</singular></name>
<name><singular>degree</singular></name>
<name><singular>arcdeg</singular></name>
</aliases>
+ <definition>measurement of a plane angle representing 1/360 of a full rotation</definition>
</unit>
<unit>
<def>°/60</def> <!-- DEGREE SIGN -->
<name><singular>arc_minute</singular></name>
<symbol>'</symbol>
- <symbol>′</symbol> <!-- PRIME -->
+ <symbol comment="PRIME">′</symbol>
<aliases>
<name><singular>angular_minute</singular></name>
<name><singular>arcminute</singular></name>
<name><singular>arcmin</singular></name>
</aliases>
+ <definition>measurement of a plane angle equal to 1/60 arc degree</definition>
</unit>
<unit>
<def>'/60</def>
<name><singular>arc_second</singular></name>
<symbol>"</symbol>
- <symbol>″</symbol> <!-- DOUBLE PRIME -->
+ <symbol comment="DOUBLE PRIME">″</symbol>
<aliases>
<name><singular>angular_second</singular></name>
<name><singular>arcsecond</singular></name>
<name><singular>arcsec</singular></name>
</aliases>
+ <definition>measurement of a plane angle equal to 1/60 arc minute</definition>
</unit>
<unit>
- <!-- The following is exact. From 1901 to 1964, however, 1
- liter was 1.000028 dm^3 -->
- <def>dm^3</def> <!-- exact -->
+ <comment>The definition is exact. From 1901 to 1964, however, 1 liter was 1.000028 dm^3 (volume of 1 kg of water under standard conditions).</comment>
+ <def comment="exact">dm^3</def>
<name><singular>liter</singular></name>
- <symbol>L</symbol> <!-- NIST recommendation -->
+ <symbol comment="NIST recommendation">L</symbol>
<aliases>
<name><singular>litre</singular></name>
<symbol>l</symbol>
</aliases>
+ <definition>unit of capacity equal to 1000 cubic centimeters</definition>
</unit>
<unit>
<def>1000 kg</def>
<name><singular>metric_ton</singular></name>
<symbol>t</symbol>
<aliases> <name><singular>tonne</singular></name> </aliases>
+ <definition>unit of weight equal to 1000 kilograms</definition>
</unit>
<!-- Units whose values are obtained experimentally -->
<unit>
+ <comment>Unit's value is obtained experimentally</comment>
<def>1.60217733e-19 J</def>
<name><singular>electronvolt</singular></name>
<symbol>eV</symbol>
<aliases>
<name><singular>electron_volt</singular></name>
</aliases>
+ <definition>unit of energy equal to the work accelerating an electron through a potential difference of one volt</definition>
</unit>
<unit>
+ <comment>Unit's value is obtained experimentally</comment>
<def>1.6605402e-27 kg</def>
<name><singular>unified_atomic_mass_unit</singular></name>
<symbol>u</symbol>
@@ -103,96 +113,122 @@ Units accepted for use with the SI
<name> <singular>atomicmassunit</singular> </name>
<name> <singular>amu</singular><noplural/></name>
</aliases>
+ <definition>standard unit for indicating mass on an atomic or molecular scale; is approximately the mass of one nucleon (either a single proton or neutron), and equivalent to 1 g/mol</definition>
</unit>
<unit>
+ <comment>Unit's value is obtained experimentally</comment>
<def>1.495979e11 m</def>
<aliases>
<name><singular>astronomical_unit</singular></name>
<symbol>ua</symbol>
</aliases>
+ <definition>unit of measurement equal to 149.6 million kilometers, the mean distance from the center of the earth to the center of the sun</definition>
</unit>
<!-- Units temporarily accepted for use with the SI. NB: <name>
and <symbol> elements appear only within <aliases>. -->
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>1852 m</def>
<aliases>
<name><singular>nautical_mile</singular></name>
</aliases>
+ <definition>unit of distance at sea, set at 1852 meters (approximately one minute of arc measured along any meridian)</definition>
</unit>
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>nautical_mile/hour</def>
<aliases>
<name><singular>international_knot</singular></name>
<name><singular>knot_international</singular></name>
<name><singular>knot</singular></name>
</aliases>
+ <definition>derived unit of speed at sea</definition>
</unit>
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>1e-10 m</def>
<aliases>
<name><singular>angstrom</singular></name>
<name><singular>ångström</singular></name>
- <symbol>Å</symbol> <!-- LATIN CAPITAL LETTER A
- WITH RING ABOVE -->
- <symbol>Å</symbol> <!-- ANGSTROM SIGN -->
+ <symbol comment="LATIN CAPITAL LETTER A WITH RING ABOVE">Å</symbol>
+ <symbol comment="ANGSTROM SIGN">Å</symbol>
</aliases>
+ <definition>unit of length equal to one hundred-millionth of a centimeter (1 meter/10**10)</definition>
</unit>
<unit>
- <def>dam^2</def>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
+ <def>dam^2</def>
<aliases>
<name><singular>are</singular></name>
<symbol>a</symbol>
</aliases>
+ <definition>unit of area equal to 100 square meters</definition>
</unit>
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>100 are</def>
<aliases> <name><singular>hectare</singular></name> </aliases>
+ <definition>unit of area equal to 100 are ('hectoare'), or 10000 square meters</definition>
</unit>
<unit>
- <def>100 fm^2</def> <!-- exact -->
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
+ <def comment="exact">100 fm^2</def>
<aliases>
<name><singular>barn</singular></name>
<symbol>b</symbol>
</aliases>
+ <definition>unit of area, approximately the cross-sectional area of a uranium nucleus (10e-28 square meters)</definition>
</unit>
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>1000 hPa</def>
<aliases>
<name><singular>bar</singular></name>
</aliases>
+ <definition>unit of pressure equal to 100000 Pascals, or about 0.987 atmospheres of pressure</definition>
</unit>
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>cm/s^2</def>
<aliases>
<name><singular>gal</singular></name>
</aliases>
+ <definition>unit of acceleration equal to 1 cm per second squared</definition>
</unit>
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>3.7e10 Bq</def>
<aliases>
<name><singular>curie</singular></name>
<symbol>Ci</symbol>
</aliases>
+ <definition>unit of radioactivity corresponding to 3.7 * 10e10 disintegrations per second</definition>
</unit>
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>2.58e-4 C/kg</def>
<aliases>
<name><singular>roentgen</singular></name>
<symbol>R</symbol>
</aliases>
+ <definition>unit of ionizing radiation, the amount producing one electrostatic unit of positive or negative ionic charge in one cubic centimeter of air under standard conditions; rarely used</definition>
</unit>
<!-- The following is commented-out because "rad" has already
been mapped to "radian"
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>cGy</def>
<aliases> <name><singular>rad</singular></name> </aliases>
+ <definition>derived unit of ionizing radiation (absorbed) dose, defined as the absorption of 1 joule of radiation energy by one kilogram of matter (one hundredth of a gray)</definition>
</unit>
-->
<unit>
+ <comment>Unit is temporarily accepted for use with the SI.</comment>
<def>cSv</def>
<aliases>
<name><singular>rem</singular></name>
</aliases>
+ <definition>unit of radiation dosage applied to humans; equal to one hundredth of a sievert</definition>
</unit>
</unit-system>
diff --git a/lib/udunits2-base.xml b/lib/udunits2-base.xml
index f463013..9ba4202 100644
--- a/lib/udunits2-base.xml
+++ b/lib/udunits2-base.xml
@@ -10,77 +10,46 @@ SI base units.
-->
<unit-system>
<unit>
- <!--
- The meter is the length of the path travelled by light in vacuum
- during a time interval of 1/299 792 458 of a second.
- -->
<base/>
<name><singular>meter</singular></name>
<symbol>m</symbol>
<aliases> <name><singular>metre</singular></name> </aliases>
+ <definition>The meter is the length of the path travelled by light in vacuum during a time interval of 1/299 792 458 of a second.</definition>
</unit>
<unit>
- <!-- The kilogram is the unit of mass; it is equal to the mass of the
- international prototype of the kilogram. -->
<base/>
<name><singular>kilogram</singular></name>
<symbol>kg</symbol>
+ <definition> The kilogram is the unit of mass; it is equal to the mass of the international prototype of the kilogram.</definition>
</unit>
<unit>
- <!--
- The second is the duration of 9 192 631 770 periods of the
- radiation corresponding to the transition between the two hyperfine
- levels of the ground state of the cesium 133 atom.
- -->
<base/>
<name><singular>second</singular></name>
<symbol>s</symbol>
+ <definition>The second is the duration of 9 192 631 770 periods of the radiation corresponding to the transition between the two hyperfine levels of the ground state of the cesium 133 atom.</definition>
</unit>
<unit>
- <!--
- The ampere is that constant current which, if maintained in two
- straight parallel conductors of infinite length, of negligible
- circular cross-section, and placed 1 meter apart in vacuum, would
- produce between these conductors a force equal to 2e-7 newton
- per meter of length.
- -->
<base/>
<name><singular>ampere</singular></name>
<symbol>A</symbol>
+ <definition>The ampere is that constant current which, if maintained in two straight parallel conductors of infinite length, of negligible circular cross-section, and placed 1 meter apart in vacuum, would produce between these conductors a force equal to 2e-7 newton per meter of length.</definition>
</unit>
<unit>
- <!--
- The kelvin, unit of thermodynamic temperature, is the fraction
- 1/273.16 of the thermodynamic temperature of the triple point of
- water.
- -->
<base/>
<name><singular>kelvin</singular></name>
<symbol>K</symbol>
+ <definition>The kelvin, unit of thermodynamic temperature, is the fraction 1/273.16 of the thermodynamic temperature of the triple point of water.</definition>
</unit>
<unit>
- <!--
- 1. The mole is the amount of substance of a system which contains
- as many elementary entities as there are atoms in 0.012 kilogram of
- carbon 12.
-
- 2. When the mole is used, the elementary entities must be specified
- and may be atoms, molecules, ions, electrons, other particles, or
- specified groups of such particles.
- -->
<base/>
<name><singular>mole</singular></name>
<symbol>mol</symbol>
+ <definition>The mole is the amount of substance of a system which contains as many elementary entities as there are atoms in 0.012 kilogram of carbon 12. When the mole is used, the elementary entities must be specified and may be atoms, molecules, ions, electrons, other particles, or specified groups of such particles.</definition>
</unit>
<unit>
- <!--
- The candela is the luminous intensity, in a given direction, of a
- source that emits monochromatic radiation of frequency 540e12
- hertz and that has a radiant intensity in that direction of 1/683
- watt per steradian.
- -->
<base/>
<name><singular>candela</singular></name>
<symbol>cd</symbol>
+ <definition>The candela is the luminous intensity, in a given direction, of a source that emits monochromatic radiation of frequency 540e12 hertz and that has a radiant intensity in that direction of 1/683 watt per steradian.</definition>
</unit>
</unit-system>
diff --git a/lib/udunits2-common.xml b/lib/udunits2-common.xml
index 250868a..e992b85 100644
--- a/lib/udunits2-common.xml
+++ b/lib/udunits2-common.xml
@@ -12,17 +12,22 @@ elements appear only within <aliases>.
<unit-system>
<!-- Synonyms for SI Units -->
<unit>
+ <comment>Synonym for SI unit</comment>
<def>s</def>
<aliases> <name> <singular>sec</singular> </name> </aliases>
+ <definition>unit of time, synonym for second</definition>
</unit>
<unit>
+ <comment>Synonym for SI unit</comment>
<def>A</def>
<aliases> <name> <singular>amp</singular> </name> </aliases>
+ <definition>unit of electric current, synonym for ampere</definition>
</unit>
<unit>
+ <comment>Synonym for SI unit</comment>
<def>K</def>
<aliases>
- <symbol>°K</symbol> <!-- DEGREE SIGN -->
+ <symbol comment="DEGREE SIGN">°K</symbol>
<name>
<singular>degree_kelvin</singular>
<plural>degrees_kelvin</plural>
@@ -44,27 +49,35 @@ elements appear only within <aliases>.
<plural>degsK</plural>
</name>
</aliases>
+ <definition>unit of temperature, synonym for kelvin</definition>
</unit>
<unit>
+ <comment>Synonym for SI unit</comment>
<def>cd</def>
<aliases> <name> <singular>candle</singular> </name> </aliases>
+ <definition>unit of luminous intensity, synonym for candela</definition>
</unit>
<unit>
+ <comment>Synonym for SI unit</comment>
<def>mole</def>
<aliases> <name> <singular>einstein</singular> </name> </aliases>
+ <definition>unit of chemical mass, synonym for mole</definition>
</unit>
<unit>
+ <comment>Synonym for SI unit</comment>
<def>Hz</def>
<aliases>
<name> <singular>baud</singular> </name>
<symbol>Bd</symbol>
<symbol>bps</symbol>
</aliases>
+ <definition>unit of frequency, synonym for hertz</definition>
</unit>
<unit>
+ <comment>Synonym for SI unit</comment>
<def>degree_Celsius</def>
<aliases>
- <symbol>℃</symbol> <!-- DEGREE CELSIUS -->
+ <symbol comment="DEGREE CELSIUS">℃</symbol>
<name> <singular>celsius</singular> </name>
<name>
<singular>degree_C</singular>
@@ -83,64 +96,80 @@ elements appear only within <aliases>.
<plural>degsC</plural>
</name>
</aliases>
+ <definition>unit of temperature, synonym for 'K @ 273.15' (degree_Celsius)</definition>
</unit>
<unit>
+ <comment>Synonym for SI unit</comment>
<def>knot</def>
<aliases>
<symbol>kt</symbol>
<symbol>kts</symbol>
</aliases>
+ <definition>unit of speed, synonym for nautical_mile/hour</definition>
</unit>
<!-- Constants -->
<unit>
- <def>6.02214179e23/mol</def> <!-- +-30e15 -->
+ <comment>Constant; value is +-30e15</comment>
+ <def>6.02214179e23/mol</def>
<aliases>
<name><singular>avogadro_constant</singular></name>
<noplural/>
</aliases>
+ <definition>number of constituent particles (usually atoms or molecules) per mole of a given substance</definition>
</unit>
<unit>
+ <comment>Constant</comment>
<def>0.01</def>
<aliases>
<name><singular>percent</singular></name>
<noplural/>
<symbol>%</symbol>
</aliases>
+ <definition>number of parts per hundred</definition>
</unit>
<unit>
+ <comment>Constant</comment>
<def>1e-6</def>
<aliases>
<symbol>ppm</symbol>
<symbol>ppmv</symbol>
</aliases>
+ <definition>parts per million</definition>
</unit>
<unit>
+ <comment>Constant</comment>
<def>1e-9</def>
<aliases>
<symbol>ppb</symbol>
<symbol>ppbv</symbol>
</aliases>
+ <definition>parts per billion</definition>
</unit>
<unit>
+ <comment>Constant</comment>
<def>1e-12</def>
<aliases>
<symbol>ppt</symbol>
<symbol>pptv</symbol>
</aliases>
+ <definition>parts per trillion</definition>
</unit>
<unit>
+ <comment>Constant</comment>
<def>1e-15</def>
<aliases>
<symbol>ppq</symbol>
<symbol>ppqv</symbol>
</aliases>
+ <definition>parts per quadrillion</definition>
</unit>
<!-- Plane Angle -->
<unit>
<def>0.9 arc_degree</def>
<aliases> <name><singular>grade</singular></name> </aliases>
+ <definition>1/100 of a right angle (90 degrees)</definition>
</unit>
<unit>
<def>2 pi rad</def>
@@ -151,6 +180,7 @@ elements appear only within <aliases>.
<name><singular>revolution</singular></name>
<name><singular>rotation</singular></name>
</aliases>
+ <definition>unit of angle in a plane signifying a full 360-degree circle</definition>
</unit>
<unit>
<def>arc_degree</def>
@@ -192,6 +222,7 @@ elements appear only within <aliases>.
<plural>degreesT</plural>
</name>
</aliases>
+ <definition>unit of angle on a sphere</definition>
</unit>
<unit>
<def>-1 degree_east</def>
@@ -209,6 +240,7 @@ elements appear only within <aliases>.
<plural>degreesW</plural>
</name>
</aliases>
+ <definition>unit of angle on a sphere (units for negative direction)</definition>
</unit>
<!-- Mass -->
@@ -217,12 +249,14 @@ elements appear only within <aliases>.
<aliases>
<name> <singular>assay_ton</singular> </name>
</aliases>
+ <definition>reference unit of mass for a body of ore; roughly equal to 29167 milligrams</definition>
</unit>
<unit>
<def>2.834952e-2 kg</def>
<aliases>
<name> <singular>avoirdupois_ounce</singular> </name>
</aliases>
+ <definition>unit of mass equal to 1/16 avoirdupois pound, commonly used in the United States (16 oz = 1 pound = 7000 grains)</definition>
</unit>
<unit>
<def>4.5359237e-1 kg</def>
@@ -231,12 +265,14 @@ elements appear only within <aliases>.
<name> <singular>pound</singular> </name>
<symbol>lb</symbol>
</aliases>
+ <definition>unit of mass in avoirdupois system of weights (a system commonly used in United States)</definition>
</unit>
<unit>
<def>2e-4 kg</def>
<aliases>
<name> <singular>carat</singular> </name>
</aliases>
+ <definition>unit of mass equal to 0.2 gram (defined 1907)</definition>
</unit>
<unit>
<def>6.479891e-5 kg</def>
@@ -244,30 +280,35 @@ elements appear only within <aliases>.
<name> <singular>grain</singular> </name>
<symbol>gr</symbol>
</aliases>
+ <definition>unit of mass equal to 1/7000 pound</definition>
</unit>
<unit>
<def>5.080235e1 kg</def>
<aliases>
<name> <singular>long_hundredweight</singular> </name>
</aliases>
+ <definition>unit of mass; a British hundredweight, which is 8 stone * 14 pounds/stone</definition>
</unit>
<unit>
<def>1.555174e-3 kg</def>
<aliases>
<name> <singular>pennyweight</singular> </name>
</aliases>
+ <definition>unit of mass; based on historical US troy weight system (is 1/20 troy ounce)</definition>
</unit>
<unit>
<def>4.535924e1 kg</def>
<aliases>
<name> <singular>short_hundredweight</singular> </name>
</aliases>
+ <definition>unit of mass, a US hundredweight, which is 100 pounds</definition>
</unit>
<unit>
<def>14.59390 kg</def>
<aliases>
<name> <singular>slug</singular> </name>
</aliases>
+ <definition>unit of mass associated with Imperial units; a mass that accelerates by 1 ft/s2 when a force of one pound-force (lbF) is exerted on it</definition>
</unit>
<unit>
<def>3.110348e-2 kg</def>
@@ -275,6 +316,7 @@ elements appear only within <aliases>.
<name> <singular>troy_ounce</singular> </name>
<name> <singular>apothecary_ounce</singular> </name>
</aliases>
+ <definition>unit of mass; based on historical US troy weight system (is 1/12 troy pound)</definition>
</unit>
<unit>
<def>3.732417e-1 kg</def>
@@ -282,26 +324,41 @@ elements appear only within <aliases>.
<name> <singular>troy_pound</singular> </name>
<name> <singular>apothecary_pound</singular> </name>
</aliases>
+ <definition>unit of mass; based on historical US troy weight system (is 5760 grain)</definition>
</unit>
<unit>
<def>20 grain</def>
<aliases> <name> <singular>scruple</singular> </name> </aliases>
+ <definition>unit of mass in apothecaries' weight system (is 1/3 apdram)</definition>
</unit>
<unit>
<def>60 grain</def>
<aliases> <name> <singular>apdram</singular> </name> </aliases>
+ <definition>unit of mass in apothecaries' weight system (is 1/8 apounce)</definition>
+ </unit>
+ <unit>
+ <comment>exact</comment>
+ <def>avoirdupois_ounce/16</def>
+ <aliases>
+ <name> <singular>dram</singular> </name>
+ <symbol>dr</symbol>
+ </aliases>
+ <definition>unit of mass in the avoirdupois system (the system commonly used in the United States)</definition>
</unit>
<unit>
<def>480 grain</def>
<aliases> <name> <singular>apounce</singular> </name> </aliases>
+ <definition>unit of mass in apothecaries' weight system (is 1/16 appound)</definition>
</unit>
<unit>
<def>5760 grain</def>
<aliases> <name> <singular>appound</singular> </name> </aliases>
+ <definition>unit of mass in apothecaries' weight system (is same as a troy pound)</definition>
</unit>
- <unit>
+ <unit>
<def>94 pound</def>
<aliases> <name> <singular>bag</singular> </name> </aliases>
+ <definition>unit of mass, for a traditional bag of portland cement</definition>
</unit>
<unit>
<def>2000 pound</def>
@@ -309,12 +366,14 @@ elements appear only within <aliases>.
<name> <singular>short_ton</singular> </name>
<name> <singular>ton</singular> </name>
</aliases>
+ <definition>unit of mass based on US weight system</definition>
</unit>
<unit>
<def>2240 pound</def>
<aliases>
<name> <singular>long_ton</singular> </name>
</aliases>
+ <definition>unit of mass based on British imperial weight system</definition>
</unit>
<!-- Length -->
@@ -323,42 +382,49 @@ elements appear only within <aliases>.
<aliases>
<name> <singular>fermi</singular> </name>
</aliases>
+ <definition>unit of length equal to 10e-15 meters, a typical length-scale of nuclear physics</definition>
</unit>
<unit>
<def>9.46073e15 m</def>
<aliases>
<name> <singular>light_year</singular> </name>
</aliases>
+ <definition>unit of length equal to the distance traversed by light in one mean solar year (365.2422 days), a typical length-scale of astronomy</definition>
</unit>
<unit>
<def>1e-6 m</def>
<aliases>
<name> <singular>micron</singular> </name>
</aliases>
+ <definition>unit of length, a typical length-scale of technology and science fields</definition>
</unit>
<unit>
<def>2.54e-5 m</def>
<aliases>
<name> <singular>mil</singular> </name>
</aliases>
+ <definition>unit of length equal to 0.001 inch, a typical length-scale for measuring wire diameters</definition>
</unit>
<unit>
<def>3.085678e16 m</def>
<aliases>
<name> <singular>parsec</singular> </name>
</aliases>
+ <definition>unit of length corresponding to the distance at which the mean radius of the earth's orbit subtends an angle of one second of arc, a typical length-scale of astronomy</definition>
</unit>
<unit>
<def>3.514598e-4 m</def>
<aliases>
<name> <singular>printers_point</singular> </name>
</aliases>
+ <definition>unit of length equal to 1/72.27 inch, the original (standardized 1886) unit for measuring font size and other small items on a printed page (see also big_point)</definition>
</unit>
<unit>
<def>2.011684e1 m</def>
<aliases>
<name> <singular>chain</singular> </name>
</aliases>
+ <definition>unit of length equal to 66 feet (4 poles), or 1/10 furlong, a typical (historical) scale of land surveying</definition>
</unit>
<unit>
<def>12 printers_point</def>
@@ -366,12 +432,14 @@ elements appear only within <aliases>.
<name> <singular>printers_pica</singular> </name>
<name> <singular>pica</singular> </name>
</aliases>
+ <definition>unit of length equal to 1/6 inch (12 printers points)</definition>
</unit>
<unit>
<def>nautical_mile</def>
<aliases>
<name> <singular>nmile</singular> </name>
</aliases>
+ <definition>unit of length in the US Customary System, equal to 6,076 feet; typically used for air and sea navigation</definition>
</unit>
<unit>
<def>(1200/3937) m</def>
@@ -381,12 +449,14 @@ elements appear only within <aliases>.
<plural>US_survey_feet</plural>
</name>
</aliases>
+ <definition>unit of length used for earlier survey data in some countries, slightly different than the current international foot</definition>
</unit>
<unit>
<def>3 US_survey_feet</def>
<aliases>
<name> <singular>US_survey_yard</singular> </name>
</aliases>
+ <definition>unit of length used in earlier survey data in some countries, slightly different than the current international yard</definition>
</unit>
<unit>
<def>5280 US_survey_feet</def>
@@ -394,6 +464,7 @@ elements appear only within <aliases>.
<name> <singular>US_survey_mile</singular> </name>
<name> <singular>US_statute_mile</singular> </name>
</aliases>
+ <definition>unit of length used for earlier survey data in some countries, slightly slightly different than the current international mile</definition>
</unit>
<unit>
<def>16.5 US_survey_feet</def>
@@ -402,14 +473,17 @@ elements appear only within <aliases>.
<name> <singular>pole</singular> </name>
<name> <singular>perch</singular> </name>
</aliases>
+ <definition>unit of length equal to one-fourth of a surveyor's chain</definition>
</unit>
<unit>
<def>660 US_survey_feet</def>
<aliases> <name> <singular>furlong</singular> </name> </aliases>
+ <definition>unit of length equal to 1/8 mile or 10 chains</definition>
</unit>
<unit>
<def>6 US_survey_feet</def>
<aliases> <name> <singular>fathom</singular> </name> </aliases>
+ <definition>unit of length equal to 6 feet in the imperial and US customary systems, typically used for measuring depth of water</definition>
</unit>
<unit>
<def>2.54 cm</def>
@@ -418,6 +492,7 @@ elements appear only within <aliases>.
<name> <singular>inch</singular> </name>
<symbol>in</symbol>
</aliases>
+ <definition>unit of length equal to 25.4 mm by definition, used in imperial and US customary systems</definition>
</unit>
<unit>
<def>12 international_inches</def>
@@ -432,6 +507,7 @@ elements appear only within <aliases>.
</name>
<symbol>ft</symbol>
</aliases>
+ <definition>unit of length equal to 12 international inches, in the imperial and US customary systems; primarily used in the United States</definition>
</unit>
<unit>
<def>3 international_feet</def>
@@ -440,6 +516,7 @@ elements appear only within <aliases>.
<name> <singular>yard</singular> </name>
<symbol>yd</symbol>
</aliases>
+ <definition>unit of length equal to 3 international feet, in the imperial and US customary systems; primarily used in the United States</definition>
</unit>
<unit>
<def>5280 international_feet</def>
@@ -448,29 +525,34 @@ elements appear only within <aliases>.
<name> <singular>mile</singular> </name>
<symbol>mi</symbol>
</aliases>
+ <definition>unit of length equal to 5280 feet, equal to 12 international inches, in the imperial and US customary systems; primarily used in the United States and other smaller countries with ties to the US or United Kingdom</definition>
</unit>
<unit>
<def>inch/72</def>
<aliases>
<name> <singular>big_point</singular> </name>
</aliases>
+ <definition>unit of length equal to 1/72 inch, standardized unit in modern computer-based publishing for measuring font size and other small items on a printed page (contrast to printers_point)</definition>
</unit>
<unit>
<def>inch/3</def>
<aliases>
<name> <singular>barleycorn</singular> </name>
</aliases>
+ <definition>unit of length based in medieval laws of England and Wales, defining an inch as being 3 barleycorns long (length of a corn of barley); still the basis for current shoe sizes in Great Britain and Ireland</definition>
</unit>
<unit>
<def>191.835 foot</def>
<aliases>
<name> <singular>arpentlin</singular> </name>
</aliases>
+ <definition>unit of length in French regions; a linear arpent is of length 10 perch (10 rod)</definition>
</unit>
<!-- Angular Velocity -->
<unit>
- <def>rotation/second</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>rotation/second</def>
<aliases>
<name>
<singular>rotation_per_second</singular>
@@ -479,10 +561,13 @@ elements appear only within <aliases>.
<symbol>rps</symbol>
<symbol>cps</symbol>
</aliases>
+ <definition>unit of angular velocity</definition>
</unit>
<unit>
- <def>rotation/minute</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>rotation/minute</def>
<aliases> <symbol>rpm</symbol> </aliases>
+ <definition>unit of angular velocity measuring the angular distance covered by a rotating object, divided by the amount of time used to cover that distance; measured perpendicular to the plane of rotation, with direction usually indicated by the right-hand rule</definition>
</unit>
<!-- Lineic Mass -->
@@ -491,12 +576,15 @@ elements appear only within <aliases>.
<aliases>
<name> <singular>denier</singular> </name>
</aliases>
+ <definition>unit of lineic mass density for fibers, equal to the mass in grams per 9000 meters (more common in United States and United Kingdom); a single strand of silk is approximately one denier</definition>
</unit>
<unit>
- <def>1e-6 kg/m</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-6 kg/m</def>
<aliases>
<name> <singular>tex</singular> </name>
</aliases>
+ <definition>unit of lineic mass density for fibers, defined as mass in grams per 1000 meters (more common in Canada and Continental Europe)</definition>
</unit>
<!-- Mass per unit time (includes flow) -->
@@ -508,6 +596,7 @@ elements appear only within <aliases>.
<plural>perms_0C</plural>
</name>
</aliases>
+ <definition>unit of mass per unit time (includes flow) for how fast water vapor flows through substance, or permeance; equals 1 gram of water vapor per hour, per square meter, per millimeter of mercury at 0 degrees C</definition>
</unit>
<unit>
<def>5.74525e-11 kg/(Pa.s.m^2)</def>
@@ -517,6 +606,7 @@ elements appear only within <aliases>.
<plural>perms_23C</plural>
</name>
</aliases>
+ <definition>unit of mass per unit time for how fast water vapor flows through substance, or permeance; equals 1 gram of water vapor per hour, per square meter, per millimeter of mercury at 23 degrees C</definition>
</unit>
<!-- Area -->
@@ -525,28 +615,34 @@ elements appear only within <aliases>.
<aliases>
<name> <singular>circular_mil</singular> </name>
</aliases>
+ <definition>unit of area equal to the area of a one-mil diameter circle</definition>
</unit>
<unit>
- <def>9.869233e-13 m^2</def> <!-- porous solid permeability -->
+ <comment>porous solid permeability</comment>
+ <def>9.869233e-13 m^2</def>
<aliases> <name> <singular>darcy</singular> </name> </aliases>
+ <definition>unit of area for measuring permeability to fluid, equal to 1 cubic centimeter of fluid with 1 centipoise viscosity in 1 second through a 1-square-centimeter cross section of porous medium 1 centimeter long at 1 atmosphere</definition>
</unit>
<unit>
- <def>160 rod^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>160 rod^2</def>
<aliases>
<name> <singular>acre</singular> </name>
</aliases>
+ <definition>unit of area in the US Customary System, used in land and sea floor measurement, equal to 43560 square feet</definition>
</unit>
<!-- Volume -->
<unit>
+ <comment>An "acre.foot", however, is 1233.4867714897 m^3. Odd.</comment>
<def>1.233489e3 m^3</def>
- <!-- An "acre.foot", however, is 1233.4867714897 m^3. Odd. -->
<aliases>
<name>
<singular>acre_foot</singular>
<plural>acre_feet</plural>
</name>
</aliases>
+ <definition>unit of volume used to describe large-scale water resources in the United State; equal to the volume of one acre of surface area with one foot of depth depth</definition>
</unit>
<unit>
<def>2.359737e-3 m^3</def>
@@ -556,6 +652,7 @@ elements appear only within <aliases>.
<plural>board_feet</plural>
</name>
</aliases>
+ <definition>unit of volume equal to the cubic contents of a piece of lumber one foot square and one inch thick, used in measuring logs and lumber in the United States and Canada</definition>
</unit>
<unit>
<def>3.523907e-2 m^3</def>
@@ -563,55 +660,70 @@ elements appear only within <aliases>.
<name> <singular>bushel</singular> </name>
<symbol>bu</symbol>
</aliases>
+ <definition>unit of volume defined as 2150.42 cubic inches or 4 pecks in the US Customary system (and formerly in England), where it is used as a dry measure</definition>
</unit>
<unit>
- <def>bushel/4</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>bushel/4</def>
<aliases>
<name> <singular>peck</singular> </name>
<symbol>pk</symbol>
</aliases>
+ <definition>unit of volume defined as 537.6 cubic inches in the US Customary system (and formerly in England), where it is used as a dry measure</definition>
</unit>
<unit>
- <def>4.546090e-3 m^3</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>4.546090e-3 m^3</def>
<aliases>
<name> <singular>Canadian_liquid_gallon</singular> </name>
</aliases>
+ <definition>unit of volume for liquids in the Imperial system</definition>
</unit>
<unit>
<def>4.404884e-3 m^3</def>
<aliases>
<name> <singular>US_dry_gallon</singular> </name>
</aliases>
+ <definition>unit of volume for dry measure in the US Customary system, defined as 1/2 peck or 1/8 bushel</definition>
</unit>
<unit>
- <def>cm^3</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>cm^3</def>
<aliases> <symbol>cc</symbol> </aliases>
+ <definition>unit of volume equal to the volume of a cube 1 centimeter on each side</definition>
</unit>
<unit>
- <def>1 m^3</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1 m^3</def>
<aliases>
<name> <singular>stere</singular> </name>
</aliases>
+ <definition>unit of volume equal to a cubic meter, originally defined primarily as a measure for firewood</definition>
</unit>
<unit>
<def>2.831685 m^3</def>
<aliases>
<name> <singular>register_ton</singular> </name>
</aliases>
+ <definition>unit of volume used for internal capacity of ships, equal to 100 cubic feet</definition>
</unit>
<unit>
- <def>US_dry_gallon/4</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_dry_gallon/4</def>
<aliases>
<name> <singular>US_dry_quart</singular> </name>
<name> <singular>dry_quart</singular> </name>
</aliases>
+ <definition>unit of volume for dry measure in the US Customary system, equal to 1/32 US bushel</definition>
</unit>
<unit>
- <def>US_dry_gallon/8</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_dry_gallon/8</def>
<aliases>
<name> <singular>US_dry_pint</singular> </name>
<name> <singular>dry_pint</singular> </name>
</aliases>
+ <definition>unit of volume for dry measure in the US Customary system, equal to 1/2 US dry quart</definition>
</unit>
<unit>
<def>3.785412e-3 m^3</def>
@@ -620,59 +732,69 @@ elements appear only within <aliases>.
<name> <singular>liquid_gallon</singular> </name>
<name> <singular>gallon</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the US Customary system, defined as 3.785412 liters</definition>
</unit>
<unit>
- <!-- The following is the definition of the petroleum industry
- -->
+ <comment>The following is the definition of the petroleum industry</comment>
<def>42 US_liquid_gallon</def>
<aliases>
<name> <singular>barrel</singular> </name>
<symbol>bbl</symbol>
</aliases>
+ <definition>unit of volume used by US and Canadian petroleum organizations</definition>
</unit>
<unit>
- <!-- The following is exact regardless of the definition of
- "barrel" -->
+ <comment>The following is exact regardless of the definition of "barrel"</comment>
<def>barrel/4</def>
<aliases>
<name> <singular>firkin</singular> </name>
</aliases>
+ <definition>unit of volume whose exact quantity depends on the type of barrel on which it is defined; in this table it is defined based on the oil barrel used by the petroleum industry</definition>
</unit>
<unit>
- <def>US_liquid_gallon/4</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_liquid_gallon/4</def>
<aliases>
<name> <singular>US_liquid_quart</singular> </name>
<name> <singular>liquid_quart</singular> </name>
<name> <singular>quart</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the US Customary system, equal to 1/4 liquid gallon</definition>
</unit>
<unit>
- <def>US_liquid_gallon/8</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_liquid_gallon/8</def>
<aliases>
<name> <singular>US_liquid_pint</singular> </name>
<name> <singular>liquid_pint</singular> </name>
<name> <singular>pint</singular> </name>
<symbol>pt</symbol>
</aliases>
+ <definition>unit of volume for liquid measure in the US Customary system, equal to 1/8 liquid gallon</definition>
</unit>
<unit>
- <def>US_liquid_gallon/16</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_liquid_gallon/16</def>
<aliases>
<name> <singular>US_liquid_cup</singular> </name>
<name> <singular>liquid_cup</singular> </name>
<name> <singular>cup</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the US Customary system, equal to 1/16 liquid gallon</definition>
</unit>
<unit>
- <def>US_liquid_gallon/32</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_liquid_gallon/32</def>
<aliases>
<name> <singular>US_liquid_gill</singular> </name>
<name> <singular>liquid_gill</singular> </name>
<name> <singular>gill</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the US Customary system, equal to 1/32 liquid gallon</definition>
</unit>
<unit>
- <def>US_liquid_gallon/128</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_liquid_gallon/128</def>
<aliases>
<name> <singular>US_fluid_ounce</singular> </name>
<name> <singular>US_liquid_ounce</singular> </name>
@@ -681,9 +803,11 @@ elements appear only within <aliases>.
<symbol>oz</symbol>
<symbol>floz</symbol>
</aliases>
+ <definition>unit of volume for liquid measure in the US Customary system, equal to 1/128 liquid gallon</definition>
</unit>
<unit>
- <def>US_fluid_ounce/2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_fluid_ounce/2</def>
<aliases>
<name> <singular>tablespoon</singular> </name>
<symbol>Tbl</symbol>
@@ -692,189 +816,216 @@ elements appear only within <aliases>.
<symbol>Tblsp</symbol>
<symbol>tblsp</symbol>
</aliases>
+ <definition>unit of volume for liquid measure in the US Customary system, equal to 1/2 liquid ounce</definition>
</unit>
<unit>
- <def>US_fluid_ounce/8</def> <!-- exact -->
- <aliases> <symbol>fldr</symbol> </aliases>
- </unit>
- <unit>
- <def>US_fluid_ounce/16</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>US_fluid_ounce/8</def>
<aliases>
- <name> <singular>dram</singular> </name>
- <symbol>dr</symbol>
+ <name> <singular>fluid_dram</singular> </name>
+ <symbol>fldr</symbol>
</aliases>
+ <definition>unit of volume for liquid measure in the apothecary system, equal to 1/8 liquid ounce</definition>
</unit>
<unit>
- <def>tablespoon/3</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>tablespoon/3</def>
<aliases>
<name> <singular>teaspoon</singular> </name>
<symbol>tsp</symbol>
</aliases>
+ <definition>unit of volume defined as 1/3 tablespoon, the actual volume of which can vary depending on the measurement system (but is based on the US Customary system in this database)</definition>
</unit>
<unit>
- <def>4.546090e-3 m^3</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>4.546090e-3 m^3</def>
<aliases>
<name> <singular>UK_liquid_gallon</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the Imperial system</definition>
</unit>
<unit>
- <def>UK_liquid_gallon/4</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>UK_liquid_gallon/4</def>
<aliases>
<name> <singular>UK_liquid_quart</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the Imperial system, equal to 1/4 liquid gallon</definition>
</unit>
<unit>
- <def>UK_liquid_gallon/8</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>UK_liquid_gallon/8</def>
<aliases>
<name> <singular>UK_liquid_pint</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the Imperial system, equal to 1/8 liquid gallon</definition>
</unit>
<unit>
- <def>UK_liquid_gallon/16</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>UK_liquid_gallon/16</def>
<aliases>
<name> <singular>UK_liquid_cup</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the Imperial system, equal to 1/16 liquid gallon</definition>
</unit>
<unit>
- <def>UK_liquid_gallon/32</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>UK_liquid_gallon/32</def>
<aliases>
<name> <singular>UK_liquid_gill</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the Imperial system, equal to 1/32 liquid gallon</definition>
</unit>
<unit>
- <def>UK_liquid_gallon/160</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>UK_liquid_gallon/160</def>
<aliases>
<name> <singular>UK_fluid_ounce</singular> </name>
<name> <singular>UK_liquid_ounce</singular> </name>
</aliases>
+ <definition>unit of volume for liquid measure in the Imperial system, equal to 1/160 liquid gallon</definition>
</unit>
<unit>
<def>lg(re (1e-6 m)^3)</def>
<aliases> <symbol>BZ</symbol> </aliases>
+ <definition>logarithmic unit used to compare the reflectivity (Z) of an unknown remote object, to the reflective return created by a droplet of rain with a diameter of 1 mm; is the base unit for "dBz", which is the typical logarithmic unit for measuring atmospheric radar reflectivity; a value of 0 Bz (0 DBz) corresponds to the return from a single cubic micron; a value of 6 Bz (60 DBz) corresponds to extremely heavy rain.</definition>
</unit>
<!-- Time -->
<unit>
<def>1e-8 s</def>
<aliases> <name> <singular>shake</singular> </name> </aliases>
+ <definition>unit of time approximating the lifetime of an individual neutron, useful for describing very brief durations, e.g., in nuclear physics</definition>
</unit>
<unit>
<def>8.616409e4 s</def>
<aliases>
<name> <singular>sidereal_day</singular> </name>
</aliases>
+ <definition>unit of time that it takes the earth to complete one revolution with respect to a star, roughly 23 hours, 56 minutes, 4 seconds</definition>
</unit>
<unit>
<def>3.590170e3 s</def>
<aliases>
<name> <singular>sidereal_hour</singular> </name>
</aliases>
+ <definition>unit of time equal to 1/24 sidereal day</definition>
</unit>
<unit>
<def>5.983617e1 s</def>
<aliases>
<name> <singular>sidereal_minute</singular> </name>
</aliases>
+ <definition>unit of time equal to 1/60 sidereal hour</definition>
</unit>
<unit>
<def>0.9972696 s</def>
<aliases>
<name> <singular>sidereal_second</singular> </name>
</aliases>
+ <definition>unit of time equal to 1/60 sidereal second</definition>
</unit>
<unit>
<def>3.155815e7 s</def>
<aliases>
<name> <singular>sidereal_year</singular> </name>
</aliases>
+ <definition>unit of time for the earth to make one complete revolution around the sun, relative to the fixed stars</definition>
</unit>
<unit>
- <!--
- Interval between 2 successive passages of sun
- through vernal equinox (365.242198781 days. See
- <http://www.ast.cam.ac.uk/pubinfo/leaflets/>,
- <http://aa.usno.navy.mil/AA/>, and
- <http://adswww.colorado.edu/adswww/astro_coord.html>):
- -->
<def>3.15569259747e7 s</def>
<aliases>
<name> <singular>tropical_year</singular> </name>
<name> <singular>year</singular> </name>
- <!-- The following is commented-out because "a" already
- maps to "are"
+ <!-- The following is commented-out because "a" already maps to "are"
<symbol>a</symbol>
-->
<symbol>yr</symbol>
</aliases>
+ <definition>unit of time; Interval between 2 successive passages of sun through vernal equinox (365.242198781 days). See http://www.ast.cam.ac.uk/pubinfo/leaflets/, http://aa.usno.navy.mil/AA/, and http://adswww.colorado.edu/adswww/astro_coord.html</definition>
</unit>
<unit>
<def>29.530589 day</def>
<aliases>
<name> <singular>lunar_month</singular> </name>
</aliases>
+ <definition>unit of time equal to the average time between successive new or full moons; equal to approximately 29 days, 12 hours, 44 minutes</definition>
</unit>
<unit>
<def>365 day</def>
<aliases>
<name> <singular>common_year</singular> </name>
</aliases>
+ <definition>unit of time corresponding to a 'normal' calendar year, that is, one without insertion of a leap day</definition>
</unit>
<unit>
<def>366 day</def>
<aliases>
<name> <singular>leap_year</singular> </name>
</aliases>
+ <definition>unit of time corresponding to a calendar year with a leap day inserted</definition>
</unit>
<unit>
<def>365.25 day</def>
<aliases>
<name> <singular>Julian_year</singular> </name>
</aliases>
+ <definition>unit of time recognized by the International Astronomical Union for use in astronomy, defined as 365.25 days of 86400 seconds</definition>
</unit>
<unit>
<def>365.2425 day</def>
<aliases>
<name> <singular>Gregorian_year</singular> </name>
</aliases>
+ <definition>unit of time based on the Gregorian Calendar, the one commonly used today; approximates the tropical year as 365 + 97/400 days</definition>
</unit>
<unit>
<def>27.321661 day</def>
<aliases>
<name> <singular>sidereal_month</singular> </name>
</aliases>
+ <definition>unit of time based on 1/12 of the sidereal year</definition>
</unit>
<unit>
<def>27.321582 day</def>
<aliases>
<name> <singular>tropical_month</singular> </name>
</aliases>
+ <definition>unit of time based on 1/12 of the tropical year</definition>
</unit>
<unit>
<def>14 day</def>
<aliases>
<name> <singular>fortnight</singular> </name>
</aliases>
+ <definition>unit of time commonly defined as 14 days</definition>
</unit>
<unit>
<def>7 day</def>
<aliases> <name> <singular>week</singular> </name> </aliases>
+ <definition>unit of time commonly defined as 7 days</definition>
</unit>
<unit>
+ <comment>multiple values have been proposed for the amount of time represented by a 'jiffy'</comment>
<def>0.01 s</def>
<aliases> <name> <singular>jiffy</singular> </name> </aliases>
+ <definition>unit of time used in computer animation as a method of defining playback rate</definition>
</unit>
<unit>
<def>1e9 year</def>
<aliases> <name> <singular>eon</singular> </name> </aliases>
+ <definition>unit of time defined in astronomy as 1 billion years</definition>
</unit>
<unit>
<def>year/12</def>
<aliases> <name> <singular>month</singular> </name> </aliases>
+ <definition>unit of time defined as the average length of time for a calendar month</definition>
</unit>
<!-- Volume per time -->
<unit>
- <def>1e6 m^3/s</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e6 m^3/s</def>
<aliases>
<name> <singular>sverdrup</singular> </name>
<!-- The following is commented-out because "Sv" means
@@ -882,29 +1033,36 @@ elements appear only within <aliases>.
<symbol>Sv</symbol>
-->
</aliases>
+ <definition>unit of volume transport, used almost exclusively to measure the volumetric rate of ocean currents</definition>
</unit>
<!-- Acceleration -->
<unit>
- <def>9.806650 m/s^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>9.806650 m/s^2</def>
<aliases>
<name> <singular>standard_free_fall</singular> </name>
</aliases>
+ <definition>unit of acceleration corresponding to the nominal gravitational acceleration of an object in a vacuum near the surface of earth</definition>
</unit>
<unit>
- <def>standard_free_fall</def> <!-- should be local -->
+ <comment>should be local</comment>
+ <def>standard_free_fall</def>
<aliases> <name> <singular>gravity</singular> </name> </aliases>
+ <definition>unit of acceleration synonymous with standard rate of free fall (in earth's gravity)</definition>
</unit>
<!-- Some "units" that make subsequent definitions easier -->
<unit>
- <def>gravity 1000 kg/m^3</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>gravity 1000 kg/m^3</def>
<aliases>
<name> <singular>conventional_water</singular> </name>
<name> <singular>water</singular> </name>
<symbol>H2O</symbol>
<symbol>h2o</symbol>
</aliases>
+ <definition>specifies the acceleration at the earth's surface of a substance with the density of water</definition>
</unit>
<unit>
<def>gravity 999.972 kg/m^3</def>
@@ -914,10 +1072,11 @@ elements appear only within <aliases>.
<plural>waters_4C</plural>
</name>
<name>
- <singular>water_39F</singular> <!-- act. 39.2 F -->
+ <singular comment="actually 39.2 F">water_39F</singular>
<plural>waters_39F</plural>
</name>
</aliases>
+ <definition>specifies the acceleration at the earth's surface of a substance with the density of water at 4 degrees C</definition>
</unit>
<unit>
<def>gravity 999.001 kg/m^3</def>
@@ -927,6 +1086,7 @@ elements appear only within <aliases>.
<plural>waters_60F</plural>
</name>
</aliases>
+ <definition>specifies the acceleration at the earth's surface of a substance with the density of water at 60 degrees F</definition>
</unit>
<unit>
<def>gravity 13595.10 kg/m^3</def>
@@ -945,6 +1105,7 @@ elements appear only within <aliases>.
</name>
<symbol>Hg</symbol>
</aliases>
+ <definition>specifies the acceleration at the earth's surface of a substance with the density of mercury at 0 degrees C</definition>
</unit>
<unit>
<def>gravity 13556.8 kg/m^3</def>
@@ -954,23 +1115,30 @@ elements appear only within <aliases>.
<plural>mercuries_60F</plural>
</name>
</aliases>
+ <definition>specifies the acceleration at the earth's surface of a substance with the density of mercury at 60 degrees F</definition>
</unit>
<!-- Force -->
<unit>
<def>standard_free_fall</def>
<aliases> <name> <singular>force</singular> </name> </aliases>
+ <definition>unit of force equivalent to the force generated by the effect of gravity</definition>
</unit>
<unit>
- <def>1e-5 N</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-5 N</def>
<aliases> <name> <singular>dyne</singular> </name> </aliases>
+ <definition>unit of force, equal to the force that produces an acceleration of one centimeter per second per second on a mass of one gram (the standard centimeter-gram-second unit of force)</definition>
</unit>
<unit>
- <def>9.806650e-3 N</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>9.806650e-3 N</def>
<aliases> <name> <singular>pond</singular> </name> </aliases>
+ <definition>unit of force, equal to the magnitude of the force exerted by one gram of mass in a 9.80665 m/s2 gravitational field</definition>
</unit>
<unit>
- <def>9.806650 N</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>9.806650 N</def>
<aliases>
<name> <singular>force_kilogram</singular> </name>
<name>
@@ -979,9 +1147,11 @@ elements appear only within <aliases>.
</name>
<symbol>kgf</symbol>
</aliases>
+ <definition>unit of force, equal to the magnitude of the force exerted by one kilogram of mass in a 9.80665 m/s2 gravitational field</definition>
</unit>
<unit>
- <def>2.780139e-1 N</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>2.780139e-1 N</def>
<aliases>
<name> <singular>force_ounce</singular> </name>
<name>
@@ -990,9 +1160,11 @@ elements appear only within <aliases>.
</name>
<symbol>ozf</symbol>
</aliases>
+ <definition>unit of force, equal to the magnitude of the force exerted by one ounce of mass in a 9.80665 m/s2 gravitational field</definition>
</unit>
<unit>
- <def>4.4482216152605 N</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>4.4482216152605 N</def>
<aliases>
<name> <singular>force_pound</singular> </name>
<name>
@@ -1001,15 +1173,19 @@ elements appear only within <aliases>.
</name>
<symbol>lbf</symbol>
</aliases>
+ <definition>unit of force, equal to the magnitude of the force exerted by one pound of mass in a 9.80665 m/s2 gravitational field</definition>
</unit>
<unit>
- <def>1.382550e-1 N</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1.382550e-1 N</def>
<aliases>
<name> <singular>poundal</singular> </name>
</aliases>
+ <definition>unit of force, that which is necessary to accelerate 1 pound-mass to 1 foot per second per second</definition>
</unit>
<unit>
- <def>gram force</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>gram force</def>
<aliases>
<name>
<singular>gram_force</singular>
@@ -1020,9 +1196,11 @@ elements appear only within <aliases>.
</name>
<symbol>gf</symbol>
</aliases>
+ <definition>unit of force, equal to the magnitude of the force exerted by one gram of mass in a 9.80665 m/s2 gravitational field</definition>
</unit>
<unit>
- <def>2000 force_pound</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>2000 force_pound</def>
<aliases>
<name> <singular>force_ton</singular> </name>
<name>
@@ -1030,27 +1208,34 @@ elements appear only within <aliases>.
<plural>tons_force</plural>
</name>
</aliases>
+ <definition>unit of force, equal to the magnitude of the force exerted by one ton of mass in a 9.80665 m/s2 gravitational field (specifically a short ton of mass)</definition>
</unit>
<unit>
- <def>1000 lbf</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1000 lbf</def>
<aliases> <name><singular>kip</singular></name> </aliases>
+ <definition>unit of force, equal to the magnitude of the force exerted by one thousand pounds of mass in a 9.80665 m/s2 gravitational field</definition>
</unit>
<!-- Pressure, Stress -->
<unit>
- <def>1.01325e5 Pa</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1.01325e5 Pa</def>
<aliases>
<name> <singular>standard_atmosphere</singular> </name>
<name> <singular>atmosphere</singular> </name>
<symbol>atm</symbol>
</aliases>
+ <definition>unit of pressure, an international reference pressure intended to represent the mean atmospheric pressure at mean sea level at the latitude of Paris, France</definition>
</unit>
<unit>
- <def>1 kg gravity/cm2</def> <!-- exact -->
+ <comment>exact; note that the symbol 'at' clashes with that of the katal ('kat'), the SI unit of catalytic activity</comment>
+ <def>1 kg gravity/cm2</def>
<aliases>
<name> <singular>technical_atmosphere</singular> </name>
<symbol>at</symbol>
</aliases>
+ <definition>unit of pressure equal to one kilogram force per square centimeter</definition>
</unit>
<unit>
<def>cm H2O</def>
@@ -1058,24 +1243,29 @@ elements appear only within <aliases>.
<symbol>cm_H2O</symbol>
<symbol>cmH2O</symbol>
</aliases>
+ <definition>unit of pressure derived from pressure head calculations using metrology; represents the pressure exerted by a column of water of 1 cm height at 4 degrees C</definition>
</unit>
<unit>
- <def>inch water_39F</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>inch water_39F</def>
<aliases>
<name>
<singular>inch_H2O_39F</singular>
<plural>inches_H2O_39F</plural>
</name>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of water of 1 inch height at 39 degrees F</definition>
</unit>
<unit>
- <def>inch water_60F</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>inch water_60F</def>
<aliases>
<name>
<singular>inch_H2O_60F</singular>
<plural>inches_H2O_60F</plural>
</name>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of water of 1 inch height at 60 degrees F</definition>
</unit>
<unit>
<def>foot water</def>
@@ -1095,6 +1285,7 @@ elements appear only within <aliases>.
<symbol>ftH2O</symbol>
<symbol>fth2o</symbol>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of water of 1 foot height at 4 degrees C</definition>
</unit>
<unit>
<def>cm Hg</def>
@@ -1102,33 +1293,40 @@ elements appear only within <aliases>.
<symbol>cm_Hg</symbol>
<symbol>cmHg</symbol>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of mercury of 1 cm height at 0 degrees C</definition>
</unit>
<unit>
- <def>mm mercury_0C</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>mm mercury_0C</def>
<aliases>
<name>
<singular>millimeter_Hg_0C</singular>
<plural>millimeters_Hg_0C</plural>
</name>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of mercury of 1 mm height at 0 degrees C</definition>
</unit>
<unit>
- <def>inch mercury_32F</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>inch mercury_32F</def>
<aliases>
<name>
<singular>inch_Hg_32F</singular>
<plural>inches_Hg_32F</plural>
</name>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of mercury of 1 inch height at 32 degrees F</definition>
</unit>
<unit>
- <def>inch mercury_60F</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>inch mercury_60F</def>
<aliases>
<name>
<singular>inch_Hg_60F</singular>
<plural>inches_Hg_60F</plural>
</name>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of mercury of 1 inch height at 60 degrees F</definition>
</unit>
<unit>
<def>mm Hg</def>
@@ -1143,6 +1341,7 @@ elements appear only within <aliases>.
<symbol>mmHg</symbol>
<symbol>mmhg</symbol>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of mercury of 1 mm height at 0 degrees C; approximately (within 0.000015%, generally below measurement error) 1 Torr, which is 1/760 standard atmospheric pressure</definition>
</unit>
<unit>
<def>inch Hg</def>
@@ -1154,53 +1353,71 @@ elements appear only within <aliases>.
<symbol>in_Hg</symbol>
<symbol>inHg</symbol>
</aliases>
+ <definition>unit of pressure representing the pressure exerted by a column of mercury of 1 inch height at 0 degrees C</definition>
</unit>
<unit>
- <def>1 pound gravity/in^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1 pound gravity/in^2</def>
<aliases> <symbol>psi</symbol> </aliases>
+ <definition>unit of pressure representing the pressure exerted, due to gravity, by a one-pound mass, of area one square inch; commonly referred to as "pounds per square inch"</definition>
</unit>
<unit>
- <def>kip/in^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>kip/in^2</def>
<aliases> <symbol>ksi</symbol> </aliases>
+ <definition>unit of pressure representing the pressure exerted, due to gravity, by a 1000-pound mass, of area one square inch</definition>
</unit>
<unit>
- <def>0.1 N/m^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>0.1 N/m^2</def>
<aliases>
<name> <singular>barie</singular> </name>
<name> <singular>barye</singular> </name>
</aliases>
+ <definition>unit of pressure equal to one dyne per square centimeter</definition>
</unit>
<unit>
- <def>lg(re 20e-6 Pa)</def> <!-- sound pressure level -->
+ <comment>sound pressure level</comment>
+ <def>lg(re 20e-6 Pa)</def>
<aliases> <symbol>B_SPL</symbol> </aliases>
+ <definition>logarithmic unit used to compare the sound pressure of an unknown sound to a standard reference sound pressure; is the base unit for "dB_SPL", a more typical logarithmic unit for measuring sound pressure (the SI unit for sound pressure is pascal); the standard reference sound pressure in air or other gases is 20 microPascal, which is usually considered the threshold of human hearing (at 1 kHz)</definition>
</unit>
<!-- Viscosity -->
<unit>
- <def>1e-1 Pa.s</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-1 Pa.s</def>
<aliases>
<name> <singular>poise</singular> </name>
</aliases>
+ <definition>unit of dynamic viscosity, corresponding to 0.1 pascal-second (pascal-second: a fluid placed between two plates, when one plate is pushed sideways with a shear stress of one pascal, moves a distance equal to the thickness of the layer between the plates in one second)</definition>
</unit>
<unit>
- <def>1e-4 m^2/s</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-4 m^2/s</def>
<aliases>
<name> <singular>stokes</singular> </name>
<symbol>St</symbol>
</aliases>
+ <definition>unit of kinematic viscosity, measuring the ratio of the dynamic viscosity to the density of the fluid; water at 20 degrees C has a kinematic viscosity about 100 stokes, or more cmomonly, 1 cSt</definition>
</unit>
<unit>
- <def>10/(Pa.s)</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>10/(Pa.s)</def>
<aliases> <name> <singular>rhe</singular> </name> </aliases>
+ <definition>unit of fluidity (reciprocal of velocity), measured in reciprocal poise</definition>
</unit>
<!-- Energy, Work, Quantity of Heat -->
<unit>
- <def>1e-7 J</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-7 J</def>
<aliases> <name> <singular>erg</singular> </name> </aliases>
+ <definition>unit of work, equal to the amount of work done by a force of one dyne exerted for a distance of one centimeter (in CGS base units, one gram centimeter-squared per second-squared)</definition>
</unit>
<unit>
- <def>1.05505585262e3 J</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1.05505585262e3 J</def>
<aliases>
<name>
<singular>IT_Btu</singular>
@@ -1211,106 +1428,133 @@ elements appear only within <aliases>.
<plural>Btus</plural>
</name>
</aliases>
+ <definition>unit of energy, equal to the energy needed to cool or heat one pound of water by one degree F; this uses the International Steam Table (IT) calorie , defined by the Fifth International Conference on the properties of Steam (1956)</definition>
</unit>
<unit>
- <def>1.05506e8 J</def> <!-- exact -->
+ <comment>exact (reference NIST Guide to SI Units)</comment>
+ <def>1.05506e8 J</def>
<aliases>
<name> <singular>EC_therm</singular> </name>
</aliases>
+ <definition>unit of energy legally defined by the Council Directive of 20 December 1979, Council of the European Communities (now the European Union, EU);.roughly equal to 100,000 IT_Btu </definition>
</unit>
<unit>
- <def>4.184000 J</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>4.184000 J</def>
<aliases>
<name> <singular>thermochemical_calorie</singular> </name>
</aliases>
+ <definition>unit of heat energy defined as 4.184 Joules exactly (International Standard ISO 31-4: Quantities and units, Part 4: Heat); approximately the energy needed to increase the temperature of 1 gram of water by 1 C</definition>
</unit>
<unit>
- <def>4.1868 J</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>4.1868 J</def>
<aliases>
<name> <singular>IT_calorie</singular> </name>
<name> <singular>calorie</singular> </name>
<symbol>cal</symbol>
</aliases>
+ <definition>unit of heat energy used in thermochemistry, the International Steam Table (IT) calorie defined by the Fifth International Conference on the properties of Steam (1956)</definition>
</unit>
<unit>
- <def>4.184 MJ/kg</def> <!-- by definition -->
+ <comment>by definition</comment>
+ <def>4.184 MJ/kg</def>
<aliases>
<name> <singular>TNT</singular><noplural/></name>
</aliases>
+ <definition>unit of energy; approximately the energy released by the detonation of a given amount of mass of TNT</definition>
</unit>
<unit>
- <def>4.184e9 J</def> <!-- by definition -->
+ <comment>by definition</comment>
+ <def>4.184e9 J</def>
<aliases>
<name>
<singular>ton_TNT</singular>
<plural>tons_TNT</plural>
</name>
</aliases>
+ <definition>unit of energy; approximately the energy released by the detonation of a 1000 kilograms of TNT</definition>
</unit>
<unit>
- <def>1.054804e8 J</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1.054804e8 J</def>
<aliases>
<name> <singular>US_therm</singular> </name>
<name> <singular>therm</singular> </name>
<symbol>thm</symbol>
</aliases>
+ <definition>unit of energy legally defined in the U.S. Federal Register of July 27, 1968, and the legal unit used by the U.S. natural gas industry</definition>
</unit>
<unit>
- <def>watt.hour</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>watt.hour</def>
<aliases>
<name> <singular>watthour</singular> </name>
</aliases>
+ <definition>unit of energy equal to the product of the power in watts and the time in hours (if the energy is being transmitted or used at a constant rate (power) over a period of time); one watt is equal to 1 Joule/second</definition>
</unit>
<unit>
- <def>1e9 eV</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e9 eV</def>
<aliases> <symbol>bev</symbol> </aliases>
+ <definition>unit of energy corresponding to 1 billion electron volts (eV)</definition>
</unit>
<!-- Power, Radiant Flux -->
<unit>
- <def>V.A</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>V.A</def>
<aliases>
<name> <singular>voltampere</singular> </name>
<symbol>VA</symbol>
</aliases>
+ <definition>unit of electric power equal to the product of one volt and one ampere, equivalent to one watt for direct current systems and a unit of apparent power for alternating current systems</definition>
</unit>
<unit>
<def>9.80950e3 W</def>
<aliases>
<name> <singular>boiler_horsepower</singular> </name>
</aliases>
+ <definition>unit of power equal to the power required to evaporate 34.5 lb of fresh water at 212 degrees F in one hour; describes a boiler's capacity to deliver steam to a steam engine</definition>
</unit>
<unit>
+ <comment>shaft_horsepower is a unit of power as delivered by a drive shaft at its output (e.g., of a ship, aircraft engine, or helicopter rotor; typically not automobiles due to drive train losses)</comment>
<def>7.456999e2 W</def>
<aliases>
<name> <singular>shaft_horsepower</singular> </name>
<name> <singular>horsepower</singular> </name>
<symbol>hp</symbol>
</aliases>
+ <definition>unit of power originally corresponding to the estimated typical power of draft horses, calculated as lifting 33000 pounds one foot in one minute (550 foot-pounds/second)</definition>
</unit>
<unit>
<def>7.35499e2 W</def>
<aliases>
<name> <singular>metric_horsepower</singular> </name>
</aliases>
+ <definition>unit of power corresponding to a calculation of 75 kilogram-meters/second</definition>
</unit>
<unit>
- <def>7.460000e2 W</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>7.460000e2 W</def>
<aliases>
<name> <singular>electric_horsepower</singular> </name>
</aliases>
+ <definition>unit of power defined in the International System of Units as exactly 746 W; generally used for power used by electrical machines</definition>
</unit>
<unit>
<def>7.46043e2 W</def>
<aliases>
<name> <singular>water_horsepower</singular> </name>
</aliases>
+ <definition>unit of power used in the U.S. primarily in rating pumps; calculated as pump capacity Q (gallons per minute) times pump pressure ("head") of P (feet of head), divided by 3956 water horsepower; the calculation assumes water density is 8 1/3 pounds per U.S. gallon, which is not exact.</definition>
</unit>
<unit>
<def>7.4570e2 W</def>
<aliases>
<name> <singular>UK_horsepower</singular> </name>
</aliases>
+ <definition>unit of power originally corresponding to the estimated typical power of draft horses, calculated as lifting 33000 pounds one foot in one minute (550 foot-pounds/second), as calculated/specified in the United Kingdom</definition>
</unit>
<unit>
<def>12000 Btu/hr</def>
@@ -1321,78 +1565,99 @@ elements appear only within <aliases>.
<plural>tons_of_refrigeration</plural>
</name>
</aliases>
+ <definition>unit of power describing the heat-extraction capacity of cooling equipment; defined as the heat absorbed by melting 1 short ton of pure ice at 0 degrees C in 24 hours</definition>
</unit>
<unit>
<def>lg(re 1 W)</def>
<aliases> <symbol>BW</symbol> </aliases>
+ <definition>unit of power in decibel scale, referenced to 1 watt; the power in bel-watts is equal to 100 times the base 10 logarithm of the power in watts (making decibel-watt, the more common term, 10 times the base 10 log of the power in watts)</definition>
</unit>
<unit>
<def>lg(re 1 mW)</def>
<aliases> <symbol>Bm</symbol> </aliases>
+ <definition>unit of power in decibel scale, referenced to 1 milliwatt; the power in bel-milliwatts is equal to 100 times the base 10 logarithm of the power in milliwatts (making decibel-milliwatt, the more common term, 10 times the base 10 log of the power in watts)</definition>
</unit>
<!-- Heat -->
<unit>
<def>1.55e-1 K.m^2/W</def>
<aliases> <name> <singular>clo</singular> </name> </aliases>
+ <definition>unit of thermal resistance used in describing the insulating value of clothing; the amount of thermal resistance needed to maintain in comfort a resting subject in a normally ventilated room (air movement 10 cm/sec) at a temperature of 20 degrees C and a humidity less than 50%</definition>
</unit>
<!-- Electricity and Magnetism -->
<unit>
<def>10 A</def>
<aliases> <name><singular>abampere</singular></name> </aliases>
+ <definition>basic unit of electricity in the electromagnetic CGS system of units</definition>
</unit>
<unit>
<def>7.957747e-1 A</def>
<aliases> <name><singular>gilbert</singular></name> </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>3.335640e-10 A</def>
<aliases>
<name><singular>statampere</singular></name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>10 A</def>
<aliases> <name><singular>biot</singular></name> </aliases>
+ <definition>basic unit of electricity in the electromagnetic CGS system of units (same as abampere), named after Jean-Baptiste Biot</definition>
</unit>
<unit>
- <def>1e9 F</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e9 F</def>
<aliases> <name> <singular>abfarad</singular> </name> </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
- <def>1e-9 H</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-9 H</def>
<aliases>
<name> <singular>abhenry</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
- <def>1e9 S</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e9 S</def>
<aliases> <name> <singular>abmho</singular> </name> </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
- <def>1e-9 ohm</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-9 ohm</def>
<aliases> <name> <singular>abohm</singular> </name> </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
- <def>1e-8 V</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-8 V</def>
<aliases> <name> <singular>abvolt</singular> </name> </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>1.602176487e-19 C</def>
<aliases> <symbol>e</symbol> </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>9.64957e4 C</def>
<aliases>
<name> <singular>chemical_faraday</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>9.65219e4 C</def>
<aliases>
<name> <singular>physical_faraday</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>9.648531e4 C</def>
@@ -1400,24 +1665,31 @@ elements appear only within <aliases>.
<name> <singular>C12_faraday</singular> </name>
<name> <singular>faraday</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
- <def>1e-9 T</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-9 T</def>
<aliases>
<name> <singular>gamma</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
- <def>1e-4 T</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-4 T</def>
<aliases>
<name> <singular>gauss</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
- <def>1e-8 Wb</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-8 Wb</def>
<aliases>
<name> <singular>maxwell</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>7.957747e1 A/m</def>
@@ -1425,68 +1697,81 @@ elements appear only within <aliases>.
<name> <singular>oersted</singular> </name>
<symbol>Oe</symbol>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>3.335640e-10 C</def>
<aliases>
<name> <singular>statcoulomb</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>1.112650e-12 F</def>
<aliases>
<name> <singular>statfarad</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>8.987554e11 H</def>
<aliases>
<name> <singular>stathenry</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>1.112650e-12 S</def>
<aliases>
<name> <singular>statmho</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>8.987554e11 ohm</def>
<aliases>
<name> <singular>statohm</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>2.997925e2 V</def>
<aliases>
<name> <singular>statvolt</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>1.256637e-7 Wb</def>
<aliases>
<name> <singular>unit_pole</singular> </name>
</aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>lg(re 1 V)</def>
<aliases> <symbol>BV</symbol> </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
- <def>lg(re 0.775 V)</def> <!-- rms voltage -->
+ <comment>rms voltage</comment>
+ <def>lg(re 0.775 V)</def>
<aliases> <symbol>Bv</symbol> </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<unit>
<def>lg(re 1e-6 V)</def>
- <aliases> <symbol>BµV</symbol> </aliases>
- <!-- uses MICRO SIGN -->
+ <aliases>
+ <symbol comment="uses MICRO SIGN">BµV</symbol>
+ </aliases>
+ <definition>unit of electricity/magnetism</definition>
</unit>
<!-- Thermodynamic Temperature -->
<unit>
<def>K/1.8</def>
<aliases>
- <symbol>°R</symbol> <!-- DEGREE SIGN -->
+ <symbol comment="DEGREE SIGN">°R</symbol>
<name>
<singular>degree_rankine</singular>
<plural>degrees_rankine</plural>
@@ -1508,12 +1793,13 @@ elements appear only within <aliases>.
<plural>degs_R</plural>
</name>
</aliases>
+ <definition>unit of thermodynamic temperature</definition>
</unit>
<unit>
- <def>°R @ 459.67</def> <!-- DEGREE SIGN -->
+ <def>°R @ 459.67</def>
<aliases>
- <symbol>°F</symbol> <!-- DEGREE SIGN -->
- <symbol>℉</symbol> <!-- DEGREE FAHRENHEIT -->
+ <symbol comment="DEGREE SIGN">°F</symbol>
+ <symbol comment="DEGREE FAHRENHEIT">℉</symbol>
<name> <singular>fahrenheit</singular> </name>
<name>
<singular>degree_fahrenheit</singular>
@@ -1536,6 +1822,7 @@ elements appear only within <aliases>.
<plural>degs_F</plural>
</name>
</aliases>
+ <definition>unit of thermodynamic temperature</definition>
</unit>
<!-- Illumination -->
@@ -1544,97 +1831,124 @@ elements appear only within <aliases>.
<aliases>
<name> <singular>footcandle</singular> </name>
</aliases>
+ <definition>unit of illumination</definition>
</unit>
<unit>
- <def>3.426259 cd/m^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>3.426259 cd/m^2</def>
<aliases>
<name> <singular>footlambert</singular> </name>
</aliases>
+ <definition>unit of illumination</definition>
</unit>
<unit>
- <def>(1e4/pi) cd/m^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>(1e4/pi) cd/m^2</def>
<aliases>
<name> <singular>lambert</singular> </name>
</aliases>
+ <definition>unit of illumination</definition>
</unit>
<unit>
- <def>1e4 cd/m^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e4 cd/m^2</def>
<aliases>
<name> <singular>stilb</singular> </name>
<symbol>sb</symbol>
</aliases>
+ <definition>unit of illumination</definition>
</unit>
<unit>
- <def>1e4 lm/m^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e4 lm/m^2</def>
<aliases>
<name> <singular>phot</singular> </name>
<symbol>ph</symbol>
</aliases>
+ <definition>unit of illumination</definition>
</unit>
<unit>
- <def>1 cd/m^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1 cd/m^2</def>
<aliases>
<name> <singular>nit</singular> </name>
<symbol>nt</symbol>
</aliases>
+ <definition>unit of illumination</definition>
</unit>
<unit>
- <def>4.184000e4 J/m^2</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>4.184000e4 J/m^2</def>
<aliases>
<name> <singular>langley</singular> </name>
</aliases>
+ <definition>unit of illumination</definition>
</unit>
<unit>
- <def>cd/(pi m^2)</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>cd/(pi m^2)</def>
<aliases>
<name> <singular>blondel</singular> </name>
<name> <singular>apostilb</singular> </name>
</aliases>
+ <definition>unit of illumination</definition>
</unit>
<!-- Miscellaneous -->
<unit>
- <def>100/m</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>100/m</def>
<aliases> <name> <singular>kayser</singular> </name> </aliases>
+ <definition></definition>
</unit>
<unit>
- <def>gravity</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>gravity</def>
<aliases>
<name> <singular>geopotential</singular> </name>
<name> <singular>dynamic</singular> </name>
<symbol>gp</symbol>
</aliases>
+ <definition></definition>
</unit>
<unit>
- <def>2056 hours</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>2056 hours</def>
<aliases>
<name> <singular>work_year</singular> </name>
</aliases>
+ <definition></definition>
</unit>
<unit>
- <def>work_year/12</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>work_year/12</def>
<aliases>
<name> <singular>work_month</singular> </name>
</aliases>
+ <definition></definition>
</unit>
<unit>
- <def>1e-6 m^2 s^-1 K kg^-1</def> <!-- exact -->
+ <comment>exact</comment>
+ <def>1e-6 m^2 s^-1 K kg^-1</def>
<aliases>
<name> <singular>potential_vorticity_unit</singular> </name>
<symbol>PVU</symbol>
</aliases>
+ <definition></definition>
</unit>
<unit>
<def>1</def>
<aliases>
<name> <singular>count</singular> </name>
</aliases>
+ <definition></definition>
</unit>
<unit>
<def>1</def>
<aliases>
<name> <singular>bit</singular> </name>
</aliases>
+ <definition></definition>
</unit>
<unit>
<def>8</def>
@@ -1642,6 +1956,7 @@ elements appear only within <aliases>.
<name><singular>octet</singular></name>
<name><singular>byte</singular></name>
</aliases>
+ <definition></definition>
</unit>
<unit>
<def>446.2 micromoles/meter^2</def>
@@ -1649,14 +1964,16 @@ elements appear only within <aliases>.
<name> <singular>dobson</singular> </name>
<symbol>DU</symbol>
</aliases>
+ <definition></definition>
</unit>
<unit>
- <def>mol/6.02214129e23</def> <!-- NIST 20130402 -->
+ <def>1/avogadro_constant</def>
<name><singular>molecule</singular></name>
<aliases>
<name><singular>molec</singular></name>
<name><singular>nucleon</singular></name>
<name><singular>nuc</singular></name>
</aliases>
+ <definition></definition>
</unit>
</unit-system>
diff --git a/lib/udunits2-derived.xml b/lib/udunits2-derived.xml
index 735fe84..c284edc 100644
--- a/lib/udunits2-derived.xml
+++ b/lib/udunits2-derived.xml
@@ -10,134 +10,177 @@ SI derived units with special names and symbols
-->
<unit-system>
<unit>
+ <comment>SI derived unit</comment>
<dimensionless/>
<name><singular>radian</singular></name>
<symbol>rad</symbol>
+ <definition>standard unit of angular measure, an angle that creates an arc in a circle equal in length to that circle's radius (roughly 57.3 degrees); as a ratio of two lengths, it has no dimension</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>rad^2</def>
<name><singular>steradian</singular></name>
<symbol>sr</symbol>
+ <definition>standard unit of solid angle measure, it is the solid angle which cuts out an area on a sphere that is the square of the sphere's radius; as a ratio of two areas, it has no dimension</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>1/s</def>
<name><singular>hertz</singular></name>
<symbol>Hz</symbol>
+ <definition>unit of frequency meaning one cycle per second</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>1e-3 kg</def>
<name><singular>gram</singular></name>
<symbol>g</symbol>
+ <definition>unit of mass equal to one thousandth of a kilogram</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>m.kg/s^2</def>
<name><singular>newton</singular></name>
<symbol>N</symbol>
+ <definition>unit of force; the amount needed to accelerate 1 kilogram of mass at the rate of 1 metre per second squared</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>N/m^2</def>
<name><singular>pascal</singular></name>
<symbol>Pa</symbol>
+ <definition>unit of pressure (force per unit area) equal to one newton per square meter</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>N.m</def>
<name><singular>joule</singular></name>
<symbol>J</symbol>
+ <definition>standard unit of work or energy, equal to the work done by a force of one newton acting along a distance of one meter</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>J/s</def>
<name><singular>watt</singular></name>
<symbol>W</symbol>
+ <definition>standard unit of power, equivalent to one joule per second, and equal to one ampere flowing across a potential difference of one volt</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>s.A</def>
<name><singular>coulomb</singular></name>
<symbol>C</symbol>
+ <definition>standard unit of electric charge, the quantity of electricity transported in one second by a current of one ampere</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>W/A</def>
<name><singular>volt</singular></name>
<symbol>V</symbol>
+ <definition>standard unit of electric potential difference (and electromotive force); the difference of potential between two points of a conductor carrying a constant current of one ampere and dissipating one watt of power</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>C/V</def>
<name><singular>farad</singular></name>
<symbol>F</symbol>
+ <definition>standard unit of capacitance; the amount which, when a capacitor is charged to a potential difference of one volt, carries a charge of one coulomb</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>V/A</def>
<name><singular>ohm</singular></name>
- <symbol>Ω</symbol> <!-- Greek capital letter omega
- (preferred) -->
+ <symbol comment="Greek capital letter omega (preferred)">Ω</symbol>
<aliases>
- <symbol>Ω</symbol> <!-- OHM SIGN -->
+ <symbol comment="OHM SIGN">Ω</symbol>
</aliases>
+ <definition>standard unit of electrical resistance; the resistance between two points of a conductor when a constant potential difference of 1.0 volt, applied to these points, produces in the conductor a current of 1.0 ampere</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>A/V</def>
<name> <singular>siemens</singular> </name>
<symbol>S</symbol>
+ <definition>unit of electric conductance; the reciprocal of one ohm</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>V.s</def>
<name><singular>weber</singular></name>
<symbol>Wb</symbol>
+ <definition>unit of magnetic flux (product of the average magnetic field times the perpendicular area that it penetrates), expressed as volt-seconds</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>Wb/m^2</def>
<name><singular>tesla</singular></name>
<symbol>T</symbol>
+ <definition>unit of flux density, equal to one weber per square meter</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>Wb/A</def>
<name><singular>henry</singular></name>
<symbol>H</symbol>
+ <definition>unit of inductance; where a circuit's current changes at a constant rate of 1 ampere per second, results in a generation of 1 V of potential difference</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>K @ 273.15</def>
<name>
<singular>degree_Celsius</singular>
<plural>degrees_Celsius</plural>
</name>
- <symbol>°C</symbol> <!-- DEGREE SIGN -->
+ <symbol comment="DEGREE SIGN">°C</symbol>
+ <definition>unit (and scale) of temperature, with same magnitude as the kelvin and a zero-point offset of 273.15</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>cd.sr</def>
<name><singular>lumen</singular></name>
<symbol>lm</symbol>
+ <definition>unit of luminous flux, a measure of the total "amount" of visible light emitted by a source; one candela-steradian</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>lm/m^2</def>
<name><singular>lux</singular></name>
<symbol>lx</symbol>
+ <definition>unit of illuminance and luminous emittance, measuring luminous flux per unit area, and used as a measure of intensity of light; equal to one lumen per square meter</definition>
</unit>
<unit>
+ <comment>SI derived unit</comment>
<def>mol/s</def>
<name><singular>katal</singular></name>
<symbol>kat</symbol>
+ <definition>unit of catalytic activity (property of a catalyst, such as an enzyme); expresses the ability to break 1 mole of bonds per second under specified conditions</definition>
</unit>
<!-- SI derived units with special names and symbols admitted for
reasons of safeguarding human health -->
- <unit>
- <def>1/s</def>
- <aliases>
- <!-- The following are aliases because "1/s" is already
- mapped to "hertz" and "Hz" -->
- <name><singular>becquerel</singular></name>
- <symbol>Bq</symbol>
- </aliases>
- </unit>
- <unit>
- <def>J/kg</def>
- <name><singular>gray</singular></name>
- <symbol>Gy</symbol>
- </unit>
- <unit>
- <def>J/kg</def>
- <aliases>
- <name><singular>sievert</singular></name>
- <symbol>Sv</symbol>
- </aliases>
- </unit>
+ <unit>
+ <comment>SI derived unit with special names/symbols admitted for reasons of safeguarding human health</comment>
+ <def>1/s</def>
+ <aliases>
+ <name comment="Is an alias because '1/s' is already mapped to 'hertz' and 'Hz'"><singular>becquerel</singular></name>
+ <symbol comment="Is an alias because '1/s' is already mapped to 'hertz' and 'Hz'">Bq</symbol>
+ </aliases>
+ <definition>unit of radioactivity; the activity of a quantity of material in which one nucleus decays per second (hence, equivalent to one unit per second)</definition>
+ </unit>
+ <unit>
+ <comment>SI derived unit with special names/symbols admitted for reasons of safeguarding human health</comment>
+ <def>J/kg</def>
+ <name><singular>gray</singular></name>
+ <symbol>Gy</symbol>
+ <definition>unit of ionizing radiation, a measure of the absorbed dose of radiation; absorption of one joule of radiation energy by one kilogram of matter</definition>
+ </unit>
+ <unit>
+ <comment>SI derived unit with special names/symbols admitted for reasons of safeguarding human health</comment>
+ <def>J/kg</def>
+ <aliases>
+ <name><singular>sievert</singular></name>
+ <symbol>Sv</symbol>
+ </aliases>
+ <definition>unit of ionizing radiation dose, measuring the health effect of low levels of ionizing radiation on the human body</definition>
+ </unit>
</unit-system>
diff --git a/lib/udunits2-prefixes.xml b/lib/udunits2-prefixes.xml
index 859a11d..05f1a49 100644
--- a/lib/udunits2-prefixes.xml
+++ b/lib/udunits2-prefixes.xml
@@ -51,8 +51,8 @@ SI prefixes
<prefix>
<value>1e-6</value>
<name>micro</name>
- <symbol>µ</symbol> <!-- MICRO SIGN -->
- <symbol>μ</symbol> <!-- Greek small letter "mu" -->
+ <symbol comment="MICRO SIGN">µ</symbol>
+ <symbol comment="Greek small letter 'mu'">μ</symbol>
<symbol>u</symbol>
</prefix>
<prefix>
diff --git a/lib/udunits2lib.pdf b/lib/udunits2lib.pdf
index 119ead1..91ea36c 100644
Binary files a/lib/udunits2lib.pdf and b/lib/udunits2lib.pdf differ
diff --git a/lib/unitToIdMap.c b/lib/unitToIdMap.c
index e243c5a..4cd6b4f 100644
--- a/lib/unitToIdMap.c
+++ b/lib/unitToIdMap.c
@@ -288,7 +288,10 @@ utimAdd(
else {
UnitAndId* targetEntry = uaiNew(unit, id);
- if (targetEntry != NULL) {
+ if (targetEntry == NULL) {
+ status = ut_get_status();
+ }
+ else {
void** rootp = selectTree(map, encoding);
UnitAndId** treeEntry = tsearch(targetEntry, rootp, compareUnits);
@@ -337,7 +340,6 @@ utimRemove(
const ut_unit* unit,
ut_encoding encoding)
{
- ut_status status;
UnitAndId targetEntry;
UnitAndId** treeEntry;
@@ -347,17 +349,14 @@ utimRemove(
targetEntry.unit = (ut_unit*)unit;
treeEntry = tfind(&targetEntry, selectTree(map, encoding), compareUnits);
- if (treeEntry == NULL || *treeEntry == NULL) {
- status = UT_SUCCESS;
- }
- else {
+ if (treeEntry != NULL && *treeEntry != NULL) {
UnitAndId* uai = *treeEntry;
(void)tdelete(uai, selectTree(map, encoding), compareUnits);
uaiFree(uai);
}
- return status;
+ return UT_SUCCESS;
}
diff --git a/lib/unitcore.c b/lib/unitcore.c
index aa22cc8..a6da804 100644
--- a/lib/unitcore.c
+++ b/lib/unitcore.c
@@ -2780,6 +2780,7 @@ ut_new_system(void)
ut_handle_error_message(
"ut_new_system(): Couldn't create dimensionless unit one");
free(system);
+ system = NULL;
}
}
diff --git a/lib/xml.c b/lib/xml.c
index e1d17f7..48527a2 100644
--- a/lib/xml.c
+++ b/lib/xml.c
@@ -35,6 +35,9 @@
#include <sys/stat.h>
#include <sys/types.h>
+#ifndef DLL_UDUNITS2
+#define XML_STATIC
+#endif
#include "expat.h"
#include "udunits2.h"
@@ -1522,7 +1525,7 @@ endSingular(
XML_StopParser(currFile->parser, 0);
}
else {
- (void)strcpy(currFile->singular, text);
+ (void)strncpy(currFile->singular, text, NAME_SIZE);
}
}
@@ -1570,7 +1573,7 @@ endPlural(
XML_StopParser(currFile->parser, 0);
}
else {
- (void)strcpy(currFile->plural, text);
+ (void)strncpy(currFile->plural, text, NAME_SIZE);
}
}
diff --git a/prog/Makefile.am b/prog/Makefile.am
index 9558897..0a22c79 100644
--- a/prog/Makefile.am
+++ b/prog/Makefile.am
@@ -30,3 +30,6 @@ EXTRA_DIST = \
debug: udunits2
UDUNITS2_XML_PATH=$(top_srcdir)/lib/udunits2.xml libtool \
--mode=execute gdb udunits2
+
+check-local: udunits2
+ ./udunits2 $(top_srcdir)/lib/udunits2.xml </dev/null
diff --git a/prog/Makefile.in b/prog/Makefile.in
index f2942b7..86c8595 100644
--- a/prog/Makefile.in
+++ b/prog/Makefile.in
@@ -597,6 +597,7 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-info
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
all-am: Makefile $(INFO_DEPS) $(PROGRAMS)
installdirs:
@@ -778,11 +779,11 @@ ps-am: $(PSS)
uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \
uninstall-info-am uninstall-pdf-am uninstall-ps-am
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-aminfo \
- clean-binPROGRAMS clean-generic clean-libtool ctags dist-info \
- distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+ clean-aminfo clean-binPROGRAMS clean-generic clean-libtool \
+ ctags dist-info distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-dvi install-dvi-am \
@@ -808,6 +809,9 @@ debug: udunits2
UDUNITS2_XML_PATH=$(top_srcdir)/lib/udunits2.xml libtool \
--mode=execute gdb udunits2
+check-local: udunits2
+ ./udunits2 $(top_srcdir)/lib/udunits2.xml </dev/null
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/prog/udunits2.c b/prog/udunits2.c
index 7dcef8e..63402b5 100644
--- a/prog/udunits2.c
+++ b/prog/udunits2.c
@@ -47,7 +47,7 @@ static const char* _cmdWant; /* command-line "want" unit specification */
static int _reveal; /* reveal problems with unit database? */
static int _encodingSet; /* is the character encoding set? */
static ut_encoding _encoding; /* the character encoding to use */
-static const char* _progname;
+static char _progname[1024];
static const char* _xmlPath = NULL; /* use default path */
static ut_system* _unitSystem;
static double _haveUnitAmount; /* amount of "have" unit */
@@ -116,23 +116,29 @@ decodeCommandLine(
int success = 0;
#ifndef _MSC_VER
- _progname = basename(argv[0]);
- #else
- {
- char *m_fname = (char*)malloc(sizeof(char)*256);
- char *m_ext = (char*)malloc(sizeof(char)*256);
- char tmp[1024];
- _splitpath(argv[0],NULL,NULL,m_fname,m_ext);
- sprintf(tmp,"%s.%s",m_fname,m_ext);
- _progname=tmp;
- free(m_fname);
- free(m_ext);
+ char* filename = basename(argv[0]);
- }
-#endif
+ if (strlen(filename)+1 > sizeof(_progname))
+ filename = "udunits2";
+
+ (void)strcpy(_progname, filename);
+#else
+ {
+ size_t len = strlen(argv[0]);
+ char* m_fname = (char*)malloc(sizeof(char)*(len+1));
+ char* m_ext = (char*)malloc(sizeof(char)*(len+1));
+ _splitpath(argv[0], NULL, NULL, m_fname, m_ext);
+ if (strlen(m_fname)+1 > sizeof(_progname))
+ (void)strcpy(_progname, "udunits2");
+ else
+ (void)strcpy(_progname, m_fname);
+ free(m_fname);
+ free(m_ext);
+ }
+#endif
while ((c = getopt(argc, argv, "ALUhrH:W:")) != -1) {
switch (c) {
diff --git a/prog/udunits2prog.pdf b/prog/udunits2prog.pdf
index 394a189..8c10816 100644
Binary files a/prog/udunits2prog.pdf and b/prog/udunits2prog.pdf differ
diff --git a/stamp-vti b/stamp-vti
index 56f73b0..24c0f3c 100644
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
- at set UPDATED 2 September 2014
- at set UPDATED-MONTH September 2014
- at set EDITION 2.2.17
- at set VERSION 2.2.17
+ at set UPDATED 2 April 2015
+ at set UPDATED-MONTH April 2015
+ at set EDITION 2.2.19
+ at set VERSION 2.2.19
diff --git a/udunits2.html b/udunits2.html
index 6f1aff7..0bc5e2e 100644
--- a/udunits2.html
+++ b/udunits2.html
@@ -1,8 +1,8 @@
<html lang="en">
<head>
-<title>UDUNITS 2.2.17 Manual</title>
+<title>UDUNITS 2.2.19 Manual</title>
<meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="UDUNITS 2.2.17 Manual">
+<meta name="description" content="UDUNITS 2.2.19 Manual">
<meta name="generator" content="makeinfo 4.13">
<link title="Top" rel="top" href="#Top">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
@@ -55,7 +55,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
--></style>
</head>
<body>
-<h1 class="settitle">UDUNITS 2.2.17 Manual</h1>
+<h1 class="settitle">UDUNITS 2.2.19 Manual</h1>
<div class="contents">
<h2>Table of Contents</h2>
<ul>
@@ -352,7 +352,7 @@ and unpack it in an appropriate place. For example,
<pre class="example"> su -
cd /usr/local/src
- wget -O - ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.17-Source.tar.gz |
+ wget -O - ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.19-Source.tar.gz |
gunzip -c | pax -r
</pre>
<div class="node">
@@ -396,7 +396,7 @@ Up: <a rel="up" accesskey="u" href="#Unix">Unix</a>
<ol type=1 start=1>
<li>Go to the top-level source-directory of this package, e.g.,
- <pre class="example"> cd udunits-2.2.17
+ <pre class="example"> cd udunits-2.2.19
</pre>
<li>If necessary, clean-up from a previous installation attempt by making
the <code>distclean</code> target using the <var>make</var> utility from step 2:
diff --git a/udunits2.info b/udunits2.info
index 0417c60..9087c5c 100644
--- a/udunits2.info
+++ b/udunits2.info
@@ -123,8 +123,9 @@ following ways:
supports the ASCII character set. The `UDUNITS-2' package
supports the following character sets: ASCII, ISO 8859-1 (Latin-1),
and the UTF-8 encoding of ISO 10646 (Unicode). This means that
- unit string specifications like "`µ°F·Ω⁻¹'" are now supported (your
- viewer must support UTF-8 to display this string correctly).
+ unit string specifications like "`µ°F·Ω⁻¹'" are now
+ supported (your viewer must support UTF-8 to display this string
+ correctly).
* *Support for logarithmic units:* The unit string specification
"`0.1 lg(re 1 mW)'" specifies a deciBel unit with a one milliwatt
@@ -255,7 +256,7 @@ appropriate place. For example,
su -
cd /usr/local/src
- wget -O - ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.17-Source.tar.gz |
+ wget -O - ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.19-Source.tar.gz |
gunzip -c | pax -r
@@ -289,7 +290,7 @@ Short instructions:
Long instructions:
1. Go to the top-level source-directory of this package, e.g.,
- cd udunits-2.2.17
+ cd udunits-2.2.19
2. If necessary, clean-up from a previous installation attempt by
making the `distclean' target using the MAKE utility from step 2:
@@ -446,19 +447,19 @@ Tag Table:
Node: Top2175
Node: Introduction4768
Node: Differences5258
-Node: Installation7744
-Node: Binary8021
-Node: Source9165
-Node: Prerequisites9554
-Node: Obtain10198
-Node: Unix10639
-Node: Autoconf10889
-Node: CMake13553
-Node: Windows13798
-Node: Library14369
-Node: Utility14584
-Node: Database14796
-Node: Support15371
-Node: Complete Index15682
+Node: Installation7749
+Node: Binary8026
+Node: Source9170
+Node: Prerequisites9559
+Node: Obtain10203
+Node: Unix10644
+Node: Autoconf10894
+Node: CMake13558
+Node: Windows13803
+Node: Library14374
+Node: Utility14589
+Node: Database14801
+Node: Support15376
+Node: Complete Index15687
End Tag Table
diff --git a/udunits2.pdf b/udunits2.pdf
index a8cda59..a84af9c 100644
Binary files a/udunits2.pdf and b/udunits2.pdf differ
diff --git a/version.texi b/version.texi
index 56f73b0..24c0f3c 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
- at set UPDATED 2 September 2014
- at set UPDATED-MONTH September 2014
- at set EDITION 2.2.17
- at set VERSION 2.2.17
+ at set UPDATED 2 April 2015
+ at set UPDATED-MONTH April 2015
+ at set EDITION 2.2.19
+ at set VERSION 2.2.19
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/udunits.git
More information about the debian-science-commits
mailing list