Import definitions.units from GNU units 2.17 with 13 new units.

Author: df7cb

NEWS.md

@@ -1,3 +1,8 @@
+6.1: Jul 8, 2018
+----------------
+* Format time using commonyears + days + hh:mm:ss.sss s.
+* Import definitions.units from GNU units 2.17 with 13 new units.
+
 6.0: Mar 7, 2018
 ----------------
 * Add @@ operator: similar to @, but returns the value of the resulting unit

debian/changelog

@@ -1,3 +1,10 @@
+postgresql-unit (6.1-1) UNRELEASED; urgency=medium
+
+  * Format time using commonyears + days + hh:mm:ss.sss s.
+  * Import definitions.units from GNU units 2.17 with 13 new units.
+
+ -- Christoph Berg <[email protected]>  Sun, 08 Jul 2018 21:46:17 +0200
+
 postgresql-unit (6.0-1) unstable; urgency=medium
 
   * Add @@ operator: similar to @, but returns the value of the resulting unit

definitions.units

@@ -2,7 +2,7 @@
 # This file is the units database for use with GNU units, a units conversion
 # program by Adrian Mariano [email protected]
 #
-# October 2017 Version 2.19
+# June 2018 Version 2.20
 #
 # Copyright (C) 1996-2002, 2004-2017
 # Free Software Foundation, Inc
@@ -2380,9 +2380,17 @@ split                   200 ml
 jeroboam                2 magnum
 rehoboam                3 magnum
 methuselah              4 magnum
+imperialbottle          4 magnum
 salmanazar              6 magnum
 balthazar               8 magnum
 nebuchadnezzar          10 magnum
+solomon                 12 magnum
+melchior                12 magnum
+sovereign               17.5 magnum
+primat                  18 magnum
+goliath                 18 magnum
+melchizedek             20 magnum
+midas                   20 magnum
 
 # The wine glass doesn't seem to have an official standard, but the same value
 # is suggested by several organization. 
@@ -3187,7 +3195,10 @@ cal_15                  calorie_15
 calorie_fifteen         cal_15
 calorie_20              4.18190 J    # Energy to go from 19.5 to 20.5 degC
 cal_20                  calorie_20
-calorie_twenty          calorie_20  
+calorie_twenty          calorie_20
+calorie_4               4.204 J      # Energy to go from 3.5 to 4.5 degC
+cal_4                   calorie_4
+calorie_four            calorie_4
 cal_mean                4.19002 J    # 1|100 energy to go from 0 to 100 degC
 Calorie                 kilocalorie  # the food Calorie
 thermie              1e6 cal_15      # Heat required to raise the
@@ -3201,10 +3212,13 @@ britishthermalunit      btu
 btu_IT                  cal_IT lb degF / gram K
 btu_th                  cal_th lb degF / gram K
 btu_mean                cal_mean lb degF / gram K
+btu_15                  cal_15 lb degF / gram K
+btu_ISO                 1055.06 J    # Exact, rounded ISO definition based
+                                     #    on the IT calorie
 quad                    quadrillion btu
 
-ECtherm                 1.05506e8 J    # Exact definition, close to 1e5 btu
-UStherm                 1.054804e8 J   # Exact definition
+ECtherm                 1e5 btu_ISO    # Exact definition
+UStherm                 1.054804e8 J   # Exact definition, 
 therm                   UStherm
 
 # Water latent heat from [23]
@@ -6357,6 +6371,9 @@ hogshead                brhogshead
 # U+2150-               1|7  For some reason these characters are getting
 # U+2151-               1|9  flagged as invalid UTF8.
 # U+2152-               1|10
+#⅐-               1|7   # fails under MacOS
+#⅑-               1|9   # fails under MacOS
+#⅒-               1|10  # fails under MacOS
 ℯ                       exp(1)      # U+212F, base of natural log
 µ-                      micro       # micro sign U+00B5
 μ-                      micro       # small mu U+03BC
@@ -6398,10 +6415,10 @@ röntgen                 roentgen
 ₩                       southkoreawon
 ₪                       israelnewshekel
 ₤                       lira
-₺                       turkeylira
+# ₺                       turkeylira  # fails under MacOS
 ₨                       rupee           # unofficial legacy rupee sign
-₹                       indiarupee      # official rupee sign
-؋                       afghanafghani
+# ₹                       indiarupee      # official rupee sign # MacOS fail
+#؋                       afghanafghani    # fails under MacOS
 ฿                       thailandbaht
 ₡                       elsalvadorcolon # Also costaricacolon
 ₣                       francefranc
@@ -6412,13 +6429,13 @@ röntgen                 roentgen
 ₮                       mongoliatugrik
 ₯                       greecedrachma
 ₱                       philippinepeso
-₲                       paraguayguarani
-₴                       ukrainehryvnia
-₵                       ghanacedi
-₸                       kazakhstantenge
-₼                       azerbaijanmanat
-₽                       russiaruble
-₾                       georgialari
+# ₲                       paraguayguarani # fails under MacOS
+#₴                       ukrainehryvnia   # fails under MacOS
+#₵                       ghanacedi        # fails under MacOS
+#₸                       kazakhstantenge  # fails under MacOS
+#₼                       azerbaijanmanat # fails under MacOS
+#₽                       russiaruble     # fails under MacOS
+#₾                       georgialari     # fails under MacOS
 ﷼                       iranrial
 ﹩                      $
 ￠                      ¢

definitions.units.patch

@@ -1,5 +1,5 @@
---- definitions.units	2017-11-28 20:17:13.021934545 +0100
-+++ definitions.units.patched	2017-11-28 20:18:05.570776490 +0100
+--- definitions.units
++++ definitions.units.patched
 @@ -196,7 +196,9 @@
  US$       !      # The US dollar is chosen arbitrarily to be the primitive
                   #   unit of money.
@@ -223,7 +223,7 @@
  gal                     gallon          # the British wine gallon of 1707.
  quart                   1|4 gallon      # See the "winegallon" entry below
  pint                    1|2 quart       # more historical information.
-@@ -2768,7 +2780,7 @@
+@@ -2776,7 +2788,7 @@
 
  number1can              10 usfloz
  number2can              19 usfloz
@@ -232,20 +232,22 @@
  number3can              4 uscups
  number5can              7 uscups
  number10can             105 usfloz
-@@ -3198,9 +3210,9 @@
+@@ -3209,10 +3221,10 @@
 
  btu                     btu_IT       # International Table BTU is the default
  britishthermalunit      btu
 -btu_IT                  cal_IT lb degF / gram K
 -btu_th                  cal_th lb degF / gram K
 -btu_mean                cal_mean lb degF / gram K
+-btu_15                  cal_15 lb degF / gram K
 +btu_IT                  cal_IT lb (degF) / gram K
 +btu_th                  cal_th lb (degF) / gram K
 +btu_mean                cal_mean lb (degF) / gram K
++btu_15                  cal_15 lb (degF) / gram K
+ btu_ISO                 1055.06 J    # Exact, rounded ISO definition based
+                                      #    on the IT calorie
  quad                    quadrillion btu
- 
- ECtherm                 1.05506e8 J    # Exact definition, close to 1e5 btu
-@@ -3325,8 +3337,8 @@
+@@ -3339,8 +3351,8 @@
                                         # of coal used in the 1950's
  barreloil               5.8 Mbtu       # Conventional value for barrel of crude
                                         # oil [E2].  Actual range is 5.6 - 6.3.
@@ -256,7 +258,7 @@
  naturalgas              naturalgas_HHV # includes energy from condensation
                                         # combustion products.  LHV is for Lower
                                         # Heating Value and excludes these.
-@@ -3361,7 +3373,7 @@
+@@ -3375,7 +3387,7 @@
 
  # Celsius heat unit: energy to raise a pound of water 1 degC
 
@@ -265,7 +267,7 @@
  chu                     celsiusheatunit
 
  POWER                   watt
-@@ -3421,13 +3433,13 @@
+@@ -3435,13 +3447,13 @@
  Uvalue                  1/Rvalue
  europeanUvalue          watt / m^2 K
  RSI                     degC m^2 / W
@@ -281,7 +283,7 @@
 
 
  # The bel was defined by engineers of Bell Laboratories to describe the
-@@ -3801,7 +3813,7 @@
+@@ -3815,7 +3827,7 @@
  europeanpoint           didotpoint        # for the point used in Europe
  cicero                  12 didotpoint
 
@@ -290,7 +292,7 @@
 
  # Type sizes
 
-@@ -3858,8 +3870,8 @@
+@@ -3872,8 +3884,8 @@
 
  INFORMATION             bit
 
@@ -301,7 +303,7 @@
  ban                     hartley              #   distributed random variable
                                               #   over 10 symbols.
  dit                     hartley              # from Decimal digIT
-@@ -3874,8 +3886,8 @@
+@@ -3888,8 +3900,8 @@
                                               #   to symbols per second.  Modern
                                               #   modems transmit several bits
                                               #   per symbol.
@@ -312,7 +314,7 @@
                                               #   them do.  But beware: for
                                               #   transmission over modems, a
                                               #   few extra bits are used so
-@@ -4230,7 +4242,7 @@
+@@ -4244,7 +4256,7 @@
  boardfeet               boardfoot
  fbm                     boardfoot    # feet board measure
  stack                   4 yard^3     # British, used for firewood and coal [18]
@@ -321,7 +323,7 @@
                                       #   sometimes called a face cord, but this
                                       #   value is equal to 1|3 cord.  Name
                                       #   comes from an old Norse word for a
-@@ -5310,7 +5322,7 @@
+@@ -5324,7 +5336,7 @@
 
  pa                      Pa
  ev                      eV
@@ -330,7 +332,7 @@
  oe                      Oe
  mh                      mH
  rd                      rod
-@@ -5543,7 +5555,8 @@
+@@ -5557,7 +5569,8 @@
  Mag                     Maz gravity        # force
  Maz                     Volm kg / oldliter # mass based on water
 
@@ -340,15 +342,15 @@
  Gf                      Grafut
  Sf                      Surf
  Vm                      Volm
-@@ -6294,7 +6307,6 @@
+@@ -6308,7 +6321,6 @@
  ton                     uston
  scruple                 apscruple
  fluidounce              usfluidounce
 -gallon                  usgallon
  bushel                  usbushel
  quarter                 quarterweight
  cup                     uscup
-@@ -6380,7 +6392,7 @@
+@@ -6397,7 +6409,7 @@
  ℈                       scruple
  ℥                       ounce
  ℔                       lb

definitions.units.patched

@@ -2,7 +2,7 @@
 # This file is the units database for use with GNU units, a units conversion
 # program by Adrian Mariano [email protected]
 #
-# October 2017 Version 2.19
+# June 2018 Version 2.20
 #
 # Copyright (C) 1996-2002, 2004-2017
 # Free Software Foundation, Inc
@@ -2392,9 +2392,17 @@ split                   200 ml
 jeroboam                2 magnum
 rehoboam                3 magnum
 methuselah              4 magnum
+imperialbottle          4 magnum
 salmanazar              6 magnum
 balthazar               8 magnum
 nebuchadnezzar          10 magnum
+solomon                 12 magnum
+melchior                12 magnum
+sovereign               17.5 magnum
+primat                  18 magnum
+goliath                 18 magnum
+melchizedek             20 magnum
+midas                   20 magnum
 
 # The wine glass doesn't seem to have an official standard, but the same value
 # is suggested by several organization. 
@@ -3199,7 +3207,10 @@ cal_15                  calorie_15
 calorie_fifteen         cal_15
 calorie_20              4.18190 J    # Energy to go from 19.5 to 20.5 degC
 cal_20                  calorie_20
-calorie_twenty          calorie_20  
+calorie_twenty          calorie_20
+calorie_4               4.204 J      # Energy to go from 3.5 to 4.5 degC
+cal_4                   calorie_4
+calorie_four            calorie_4
 cal_mean                4.19002 J    # 1|100 energy to go from 0 to 100 degC
 Calorie                 kilocalorie  # the food Calorie
 thermie              1e6 cal_15      # Heat required to raise the
@@ -3213,10 +3224,13 @@ britishthermalunit      btu
 btu_IT                  cal_IT lb (degF) / gram K
 btu_th                  cal_th lb (degF) / gram K
 btu_mean                cal_mean lb (degF) / gram K
+btu_15                  cal_15 lb (degF) / gram K
+btu_ISO                 1055.06 J    # Exact, rounded ISO definition based
+                                     #    on the IT calorie
 quad                    quadrillion btu
 
-ECtherm                 1.05506e8 J    # Exact definition, close to 1e5 btu
-UStherm                 1.054804e8 J   # Exact definition
+ECtherm                 1e5 btu_ISO    # Exact definition
+UStherm                 1.054804e8 J   # Exact definition, 
 therm                   UStherm
 
 # Water latent heat from [23]
@@ -6369,6 +6383,9 @@ hogshead                brhogshead
 # U+2150-               1|7  For some reason these characters are getting
 # U+2151-               1|9  flagged as invalid UTF8.
 # U+2152-               1|10
+#⅐-               1|7   # fails under MacOS
+#⅑-               1|9   # fails under MacOS
+#⅒-               1|10  # fails under MacOS
 ℯ                       exp(1)      # U+212F, base of natural log
 µ-                      micro       # micro sign U+00B5
 μ-                      micro       # small mu U+03BC
@@ -6410,10 +6427,10 @@ röntgen                 roentgen
 ₩                       southkoreawon
 ₪                       israelnewshekel
 ₤                       lira
-₺                       turkeylira
+# ₺                       turkeylira  # fails under MacOS
 ₨                       rupee           # unofficial legacy rupee sign
-₹                       indiarupee      # official rupee sign
-؋                       afghanafghani
+# ₹                       indiarupee      # official rupee sign # MacOS fail
+#؋                       afghanafghani    # fails under MacOS
 ฿                       thailandbaht
 ₡                       elsalvadorcolon # Also costaricacolon
 ₣                       francefranc
@@ -6424,13 +6441,13 @@ röntgen                 roentgen
 ₮                       mongoliatugrik
 ₯                       greecedrachma
 ₱                       philippinepeso
-₲                       paraguayguarani
-₴                       ukrainehryvnia
-₵                       ghanacedi
-₸                       kazakhstantenge
-₼                       azerbaijanmanat
-₽                       russiaruble
-₾                       georgialari
+# ₲                       paraguayguarani # fails under MacOS
+#₴                       ukrainehryvnia   # fails under MacOS
+#₵                       ghanacedi        # fails under MacOS
+#₸                       kazakhstantenge  # fails under MacOS
+#₼                       azerbaijanmanat # fails under MacOS
+#₽                       russiaruble     # fails under MacOS
+#₾                       georgialari     # fails under MacOS
 ﷼                       iranrial
 ﹩                      $
 ￠                      ¢