numru-units 1.7.0 → 1.9.0

data/src/units.rb

@@ -1,468 +1,20 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.5
-# from racc grammer file "units.racc".
+# This file is automatically generated by Racc 1.4.8
+# from Racc grammer file "".
 #
-#
-# tmp.rb: generated by racc (runtime embedded)
-#
-###### racc/parser.rb begin
-unless $".index 'racc/parser.rb'
-$".push 'racc/parser.rb'
-
-#
-# $Id: units.rb,v 1.24 2011-08-03 09:16:08 horinout Exp $
-#
-# Copyright (c) 1999-2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the same terms of ruby.
-#
-# As a special exception, when this code is copied by Racc
-# into a Racc output file, you may use that output file
-# without restriction.
-#
-
-unless defined?(NotImplementedError)
-  NotImplementedError = NotImplementError
-end
-
-module Racc
-  class ParseError < StandardError; end
-end
-unless defined?(::ParseError)
-  ParseError = Racc::ParseError
-end
-
-module Racc
-
-  unless defined?(Racc_No_Extentions)
-    Racc_No_Extentions = false
-  end
-
-  class Parser
-
-    Racc_Runtime_Version = '1.4.5'
-    Racc_Runtime_Revision = '$Revision: 1.24 $'.split[1]
-
-    Racc_Runtime_Core_Version_R = '1.4.5'
-    Racc_Runtime_Core_Revision_R = '$Revision: 1.24 $'.split[1]
-    begin
-      require 'racc/cparse'
-    # Racc_Runtime_Core_Version_C  = (defined in extention)
-      Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2]
-      unless new.respond_to?(:_racc_do_parse_c, true)
-        raise LoadError, 'old cparse.so'
-      end
-      if Racc_No_Extentions
-        raise LoadError, 'selecting ruby version of racc runtime core'
-      end
-
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_c
-      Racc_YY_Parse_Method         = :_racc_yyparse_c
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_C
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_C
-      Racc_Runtime_Type            = 'c'
-    rescue LoadError
-      Racc_Main_Parsing_Routine    = :_racc_do_parse_rb
-      Racc_YY_Parse_Method         = :_racc_yyparse_rb
-      Racc_Runtime_Core_Version    = Racc_Runtime_Core_Version_R
-      Racc_Runtime_Core_Revision   = Racc_Runtime_Core_Revision_R
-      Racc_Runtime_Type            = 'ruby'
-    end
-
-    def Parser.racc_runtime_type
-      Racc_Runtime_Type
-    end
-
-    private
-
-    def _racc_setup
-      @yydebug = false unless self.class::Racc_debug_parser
-      @yydebug = false unless defined?(@yydebug)
-      if @yydebug
-        @racc_debug_out = $stderr unless defined?(@racc_debug_out)
-        @racc_debug_out ||= $stderr
-      end
-      arg = self.class::Racc_arg
-      arg[13] = true if arg.size < 14
-      arg
-    end
-
-    def _racc_init_sysvars
-      @racc_state  = [0]
-      @racc_tstack = []
-      @racc_vstack = []
-
-      @racc_t = nil
-      @racc_val = nil
-
-      @racc_read_next = true
-
-      @racc_user_yyerror = false
-      @racc_error_status = 0
-    end
-
-    ###
-    ### do_parse
-    ###
-
-    def do_parse
-      __send__(Racc_Main_Parsing_Routine, _racc_setup(), false)
-    end
-
-    def next_token
-      raise NotImplementedError, "#{self.class}\#next_token is not defined"
-    end
-
-    def _racc_do_parse_rb(arg, in_debug)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-
-      _racc_init_sysvars
-      tok = act = i = nil
-      nerr = 0
-
-      catch(:racc_end_parse) {
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            if @racc_read_next
-              if @racc_t != 0   # not EOF
-                tok, @racc_val = next_token()
-                unless tok      # EOF
-                  @racc_t = 0
-                else
-                  @racc_t = (token_table[tok] or 1)   # error token
-                end
-                racc_read_token(@racc_t, tok, @racc_val) if @yydebug
-                @racc_read_next = false
-              end
-            end
-            i += @racc_t
-            unless i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-          else
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-        end
-      }
-    end
-
-    ###
-    ### yyparse
-    ###
-
-    def yyparse(recv, mid)
-      __send__(Racc_YY_Parse_Method, recv, mid, _racc_setup(), true)
-    end
-
-    def _racc_yyparse_rb(recv, mid, arg, c_debug)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-
-      _racc_init_sysvars
-      tok = nil
-      act = nil
-      i = nil
-      nerr = 0
-
-      catch(:racc_end_parse) {
-        until i = action_pointer[@racc_state[-1]]
-          while act = _racc_evalact(action_default[@racc_state[-1]], arg)
-            ;
-          end
-        end
-        recv.__send__(mid) do |tok, val|
-          unless tok
-            @racc_t = 0
-          else
-            @racc_t = (token_table[tok] or 1)   # error token
-          end
-          @racc_val = val
-          @racc_read_next = false
-
-          i += @racc_t
-          unless i >= 0 and
-                 act = action_table[i] and
-                 action_check[i] == @racc_state[-1]
-            act = action_default[@racc_state[-1]]
-          end
-          while act = _racc_evalact(act, arg)
-            ;
-          end
-
-          while not (i = action_pointer[@racc_state[-1]]) or
-                not @racc_read_next or
-                @racc_t == 0   # $
-            unless i and i += @racc_t and
-                   i >= 0 and
-                   act = action_table[i] and
-                   action_check[i] == @racc_state[-1]
-              act = action_default[@racc_state[-1]]
-            end
-            while act = _racc_evalact(act, arg)
-              ;
-            end
-          end
-        end
-      }
-    end
-
-    ###
-    ### common
-    ###
-
-    def _racc_evalact(act, arg)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-      nerr = 0   # tmp
-
-      if act > 0 and act < shift_n
-        #
-        # shift
-        #
-        if @racc_error_status > 0
-          @racc_error_status -= 1 unless @racc_t == 1   # error token
-        end
-        @racc_vstack.push @racc_val
-        @racc_state.push act
-        @racc_read_next = true
-        if @yydebug
-          @racc_tstack.push @racc_t
-          racc_shift @racc_t, @racc_tstack, @racc_vstack
-        end
-
-      elsif act < 0 and act > -reduce_n
-        #
-        # reduce
-        #
-        code = catch(:racc_jump) {
-          @racc_state.push _racc_do_reduce(arg, act)
-          false
-        }
-        if code
-          case code
-          when 1 # yyerror
-            @racc_user_yyerror = true   # user_yyerror
-            return -reduce_n
-          when 2 # yyaccept
-            return shift_n
-          else
-            raise '[Racc Bug] unknown jump code'
-          end
-        end
-
-      elsif act == shift_n
-        #
-        # accept
-        #
-        racc_accept if @yydebug
-        throw :racc_end_parse, @racc_vstack[0]
-
-      elsif act == -reduce_n
-        #
-        # error
-        #
-        case @racc_error_status
-        when 0
-          unless arg[21]    # user_yyerror
-            nerr += 1
-            on_error @racc_t, @racc_val, @racc_vstack
-          end
-        when 3
-          if @racc_t == 0   # is $
-            throw :racc_end_parse, nil
-          end
-          @racc_read_next = true
-        end
-        @racc_user_yyerror = false
-        @racc_error_status = 3
-        while true
-          if i = action_pointer[@racc_state[-1]]
-            i += 1   # error token
-            if  i >= 0 and
-                (act = action_table[i]) and
-                action_check[i] == @racc_state[-1]
-              break
-            end
-          end
-          throw :racc_end_parse, nil if @racc_state.size <= 1
-          @racc_state.pop
-          @racc_vstack.pop
-          if @yydebug
-            @racc_tstack.pop
-            racc_e_pop @racc_state, @racc_tstack, @racc_vstack
-          end
-        end
-        return act
-
-      else
-        raise "[Racc Bug] unknown action #{act.inspect}"
-      end
-
-      racc_next_state(@racc_state[-1], @racc_state) if @yydebug
-
-      nil
-    end
-
-    def _racc_do_reduce(arg, act)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
-      state = @racc_state
-      vstack = @racc_vstack
-      tstack = @racc_tstack
-
-      i = act * -3
-      len       = reduce_table[i]
-      reduce_to = reduce_table[i+1]
-      method_id = reduce_table[i+2]
-      void_array = []
-
-      tmp_t = tstack[-len, len] if @yydebug
-      tmp_v = vstack[-len, len]
-      tstack[-len, len] = void_array if @yydebug
-      vstack[-len, len] = void_array
-      state[-len, len]  = void_array
-
-      # tstack must be updated AFTER method call
-      if use_result
-        vstack.push __send__(method_id, tmp_v, vstack, tmp_v[0])
-      else
-        vstack.push __send__(method_id, tmp_v, vstack)
-      end
-      tstack.push reduce_to
-
-      racc_reduce(tmp_t, reduce_to, tstack, vstack) if @yydebug
-
-      k1 = reduce_to - nt_base
-      if i = goto_pointer[k1]
-        i += state[-1]
-        if i >= 0 and (curstate = goto_table[i]) and goto_check[i] == k1
-          return curstate
-        end
-      end
-      goto_default[k1]
-    end
-
-    def on_error(t, val, vstack)
-      raise ParseError, sprintf("\nparse error on value %s (%s)",
-                                val.inspect, token_to_str(t) || '?')
-    end
-
-    def yyerror
-      throw :racc_jump, 1
-    end
-
-    def yyaccept
-      throw :racc_jump, 2
-    end
-
-    def yyerrok
-      @racc_error_status = 0
-    end
-
-    #
-    # for debugging output
-    #
-
-    def racc_read_token(t, tok, val)
-      @racc_debug_out.print 'read    '
-      @racc_debug_out.print tok.inspect, '(', racc_token2str(t), ') '
-      @racc_debug_out.puts val.inspect
-      @racc_debug_out.puts
-    end
-
-    def racc_shift(tok, tstack, vstack)
-      @racc_debug_out.puts "shift   #{racc_token2str tok}"
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_reduce(toks, sim, tstack, vstack)
-      out = @racc_debug_out
-      out.print 'reduce '
-      if toks.empty?
-        out.print ' <none>'
-      else
-        toks.each {|t| out.print ' ', racc_token2str(t) }
-      end
-      out.puts " --> #{racc_token2str(sim)}"
-          
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_accept
-      @racc_debug_out.puts 'accept'
-      @racc_debug_out.puts
-    end
-
-    def racc_e_pop(state, tstack, vstack)
-      @racc_debug_out.puts 'error recovering mode: pop token'
-      racc_print_states state
-      racc_print_stacks tstack, vstack
-      @racc_debug_out.puts
-    end
-
-    def racc_next_state(curstate, state)
-      @racc_debug_out.puts  "goto    #{curstate}"
-      racc_print_states state
-      @racc_debug_out.puts
-    end
-
-    def racc_print_stacks(t, v)
-      out = @racc_debug_out
-      out.print '        ['
-      t.each_index do |i|
-        out.print ' (', racc_token2str(t[i]), ' ', v[i].inspect, ')'
-      end
-      out.puts ' ]'
-    end
-
-    def racc_print_states(s)
-      out = @racc_debug_out
-      out.print '        ['
-      s.each {|st| out.print ' ', st }
-      out.puts ' ]'
-    end
-
-    def racc_token2str(tok)
-      self.class::Racc_token_to_s_table[tok] or
-          raise "[Racc Bug] can't convert token #{tok} to string"
-    end
-
-    def token_to_str(t)
-      self.class::Racc_token_to_s_table[t]
-    end
-
-  end
-
-end
-end
-###### racc/parser.rb end
 
+require 'racc/parser.rb'
 
 
 require 'date'
 
-
 module NumRu
-class Units < Racc::Parser
+  class Units < Racc::Parser
 
+module_eval(<<'...end units.racc/module_eval...', 'units.racc', 65)
+
+VERSION = "1.9"
 
 =begin
 = class Node
@@ -754,7 +306,7 @@ UDEFS = {
   "astronomical_unit" => "1.49597870e11 m",
   "astronomical_units" => "1.49597870e11 m",  "atm" => "atmosphere",
   "atmosphere" => "101325 Pa",  "bar" => "1e6 dyn.cm-2",
-  "cal" => "calorie",  "calorie" => "4.18605 J",
+  "cal" => "calorie",  "calorie" => "4.18605 J",  "candela" => "cd",
   "celsius" => "K @ 273.15",  "centigrade" => "K @ 273.15",
   "century" => "100 year",  "chain" => "22 yard",
   "common_year" => "365 day",
@@ -776,30 +328,30 @@ UDEFS = {
   "fahrenheit" => "degree_F",  "farad" => "coulomb/volt",
   "feet" => "foot",  "fermi" => "1.0e-15 m",  "foot" => "12 inch",
   "force" => "9.80665 m.s-2",  "ft" => "foot",  "g" => "kg/1000",
-  "gal" => "cm s-2",  "gauss" => "T / 10000",  "gram" => "kg/1000",
-  "gravity" => "9.806650 meter/second2",  "h" => "60 min",
-  "hectare" => "100 are",  "hertz" => "Hz",  "hg" => "mercury",
-  "horse_power" => "75 m kilogram-force / s",  "hour" => "60 min",
-  "hr" => "60 min",  "in" => "inch",  "inch" => "2.54 cm",
-  "joule" => "J",  "kelvin" => "K",  "kgf" => "kilogram-force",
-  "kilogram" => "kg",  "knot" => "nautical_mile / hour",
-  "kph" => "km / hour",  "lb" => "pound",
-  "light_speed" => "299792458 m/s",  "light_year" => "9.46e15 m",
-  "light_years" => "9.46e15 m",  "litre" => "1.0e-3 m3",
-  "lm" => "cd.sr",  "lx" => "lm.m-2",  "ly" => "light_year",
-  "mb" => "bar / 1000",  "mercury" => "conventional_mercury",
-  "meter" => "metre",  "metre" => "m",  "mgal" => "cm s-2 / 1000",
-  "micron" => "1.0e-6 m",  "mile" => "1760 yard",
-  "millibar" => "bar / 1000",  "min" => "60 s",  "minute" => "60 s",
-  "minute_angle" => "pi.rad/180/60",  "mole" => "mol",
-  "mon" => "month",  "month" => "6 pentad",  "mph" => "mile / hour",
-  "nautical_mile" => "1852 m",  "nautical_miles" => "1852 m",
-  "newton" => "N",  "ohm" => "V/A",  "ounce" => "pound / 16",
-  "oz" => "ounce",  "parsec" => "3.0857e16 m",  "pascal" => "Pa",
-  "pc" => "parsec",  "percent" => "1e-2",  "permil" => "1e-3",
-  "pi" => "3.141592653589793238462",  "poise" => "dyn s / cm2",
-  "pound" => "453.6 g",  "psi" => "pound-force / inch2",
-  "radian" => "rad",  "second" => "s",
+  "gal" => "cm s-2",  "gauss" => "T / 10000",  "gpm" => "m",
+  "gram" => "kg/1000",  "gravity" => "9.806650 meter/second2",
+  "h" => "60 min",  "hectare" => "100 are",  "hertz" => "Hz",
+  "hg" => "mercury",  "horse_power" => "75 m kilogram-force / s",
+  "hour" => "60 min",  "hr" => "60 min",  "in" => "inch",
+  "inch" => "2.54 cm",  "joule" => "J",  "kelvin" => "K",
+  "kgf" => "kilogram-force",  "kilogram" => "kg",
+  "knot" => "nautical_mile / hour",  "kph" => "km / hour",
+  "lb" => "pound",  "light_speed" => "299792458 m/s",
+  "light_year" => "9.46e15 m",  "light_years" => "9.46e15 m",
+  "litre" => "1.0e-3 m3",  "lm" => "cd.sr",  "lx" => "lm.m-2",
+  "ly" => "light_year",  "mb" => "bar / 1000",
+  "mercury" => "conventional_mercury",  "meter" => "metre",
+  "metre" => "m",  "mgal" => "cm s-2 / 1000",  "micron" => "1.0e-6 m",
+  "mile" => "1760 yard",  "millibar" => "bar / 1000",  "min" => "60 s",
+  "minute" => "60 s",  "minute_angle" => "pi.rad/180/60",
+  "mole" => "mol",  "mon" => "month",  "month" => "6 pentad",
+  "mph" => "mile / hour",  "nautical_mile" => "1852 m",
+  "nautical_miles" => "1852 m",  "newton" => "N",  "ohm" => "V/A",
+  "ounce" => "pound / 16",  "oz" => "ounce",  "parsec" => "3.0857e16 m",
+  "pascal" => "Pa",  "pc" => "parsec",  "percent" => "1e-2",
+  "permil" => "1e-3",  "pi" => "3.141592653589793238462",
+  "poise" => "dyn s / cm2",  "pound" => "453.6 g",
+  "psi" => "pound-force / inch2",  "radian" => "rad",  "second" => "s",
   "second_angle" => "pi.rad/180/60/60",  "steradian" => "sr",
   "stokes" => "cm2 / s",  "t" => "ton",  "tesla" => "Wb.m-2",
   "ton" => "1000 kg",  "tonne" => "ton",  "torr" => "133.322 Pa",
@@ -807,7 +359,7 @@ UDEFS = {
   "yd" => "yard",  "year" => "12 month",  "yr" => "year",
 }
 UALIASES = {
-  "Celsiuses" => [0, "Celsius"],  "E%" => [18, "%"],  "EA" => [18, "A"],
+  "Celsiuses" => [0, "Celsius"],  "EA" => [18, "A"],
   "EAu" => [18, "Au"],  "EBq" => [18, "Bq"],  "EC" => [18, "C"],
   "EF" => [18, "F"],  "EG" => [18, "G"],  "EGal" => [18, "Gal"],
   "EGy" => [18, "Gy"],  "EH" => [18, "H"],  "EHg" => [18, "Hg"],
@@ -817,9 +369,9 @@ UALIASES = {
   "ESv" => [18, "Sv"],  "ET" => [18, "T"],  "EV" => [18, "V"],
   "EW" => [18, "W"],  "EWb" => [18, "Wb"],  "Ea" => [18, "a"],
   "Eac" => [18, "ac"],  "Eatm" => [18, "atm"],  "Ebar" => [18, "bar"],
-  "Ecal" => [18, "cal"],
+  "Ecal" => [18, "cal"],  "Ecd" => [18, "cd"],
   "Econventional_mercury" => [18, "conventional_mercury"],
-  "Ed" => [18, "d"],  "EdegC" => [18, "degC"],  "EdegF" => [18, "degF"],
+  "EdegC" => [18, "degC"],  "EdegF" => [18, "degF"],
   "Edeg_C" => [18, "deg_C"],  "Edeg_F" => [18, "deg_F"],
   "EdegreeC" => [18, "degreeC"],  "EdegreeF" => [18, "degreeF"],
   "Edegree_C" => [18, "degree_C"],  "Edegree_E" => [18, "degree_E"],
@@ -838,17 +390,15 @@ UALIASES = {
   "Eerg" => [18, "erg"],  "Eforce" => [18, "force"],  "Eg" => [18, "g"],
   "Egravity" => [18, "gravity"],  "Eh" => [18, "h"],
   "Ehg" => [18, "hg"],  "Ehr" => [18, "hr"],  "Ein" => [18, "in"],
-  "Ekg" => [18, "kg"],  "Ekgf" => [18, "kgf"],  "Ekph" => [18, "kph"],
-  "Elb" => [18, "lb"],  "Elm" => [18, "lm"],  "Elx" => [18, "lx"],
-  "Ely" => [18, "ly"],  "Em" => [18, "m"],  "Emb" => [18, "mb"],
+  "Ekgf" => [18, "kgf"],  "Ekph" => [18, "kph"],  "Elb" => [18, "lb"],
+  "Elm" => [18, "lm"],  "Elx" => [18, "lx"],  "Ely" => [18, "ly"],
+  "Em" => [18, "m"],  "Emb" => [18, "mb"],
   "Emercury" => [18, "mercury"],  "Emgal" => [18, "mgal"],
   "Emin" => [18, "min"],  "Emol" => [18, "mol"],  "Emon" => [18, "mon"],
   "Emph" => [18, "mph"],  "Eohm" => [18, "ohm"],  "Eoz" => [18, "oz"],
-  "Epc" => [18, "pc"],  "Epercent" => [18, "percent"],
-  "Epermil" => [18, "permil"],  "Epsi" => [18, "psi"],
-  "Erad" => [18, "rad"],  "Es" => [18, "s"],  "Esr" => [18, "sr"],
-  "Et" => [18, "t"],  "Eyr" => [18, "yr"],
-  "Fahrenheits" => [0, "Fahrenheit"],  "G%" => [9, "%"],
+  "Epc" => [18, "pc"],  "Epsi" => [18, "psi"],  "Erad" => [18, "rad"],
+  "Es" => [18, "s"],  "Esr" => [18, "sr"],  "Et" => [18, "t"],
+  "Eyr" => [18, "yr"],  "Fahrenheits" => [0, "Fahrenheit"],
   "GA" => [9, "A"],  "GAu" => [9, "Au"],  "GBq" => [9, "Bq"],
   "GC" => [9, "C"],  "GF" => [9, "F"],  "GG" => [9, "G"],
   "GGal" => [9, "Gal"],  "GGy" => [9, "Gy"],  "GH" => [9, "H"],
@@ -858,9 +408,9 @@ UALIASES = {
   "GSt" => [9, "St"],  "GSv" => [9, "Sv"],  "GT" => [9, "T"],
   "GV" => [9, "V"],  "GW" => [9, "W"],  "GWb" => [9, "Wb"],
   "Ga" => [9, "a"],  "Gac" => [9, "ac"],  "Gatm" => [9, "atm"],
-  "Gbar" => [9, "bar"],  "Gcal" => [9, "cal"],
+  "Gbar" => [9, "bar"],  "Gcal" => [9, "cal"],  "Gcd" => [9, "cd"],
   "Gconventional_mercury" => [9, "conventional_mercury"],
-  "Gd" => [9, "d"],  "GdegC" => [9, "degC"],  "GdegF" => [9, "degF"],
+  "GdegC" => [9, "degC"],  "GdegF" => [9, "degF"],
   "Gdeg_C" => [9, "deg_C"],  "Gdeg_F" => [9, "deg_F"],
   "GdegreeC" => [9, "degreeC"],  "GdegreeF" => [9, "degreeF"],
   "Gdegree_C" => [9, "degree_C"],  "Gdegree_E" => [9, "degree_E"],
@@ -877,29 +427,28 @@ UALIASES = {
   "Gdegrees_west" => [9, "degrees_west"],  "Gdyn" => [9, "dyn"],
   "Gerg" => [9, "erg"],  "Gforce" => [9, "force"],  "Gg" => [9, "g"],
   "Ggravity" => [9, "gravity"],  "Gh" => [9, "h"],  "Ghg" => [9, "hg"],
-  "Ghr" => [9, "hr"],  "Gin" => [9, "in"],  "Gkg" => [9, "kg"],
-  "Gkgf" => [9, "kgf"],  "Gkph" => [9, "kph"],  "Glb" => [9, "lb"],
-  "Glm" => [9, "lm"],  "Glx" => [9, "lx"],  "Gly" => [9, "ly"],
-  "Gm" => [9, "m"],  "Gmb" => [9, "mb"],  "Gmercury" => [9, "mercury"],
+  "Ghr" => [9, "hr"],  "Gin" => [9, "in"],  "Gkgf" => [9, "kgf"],
+  "Gkph" => [9, "kph"],  "Glb" => [9, "lb"],  "Glm" => [9, "lm"],
+  "Glx" => [9, "lx"],  "Gly" => [9, "ly"],  "Gm" => [9, "m"],
+  "Gmb" => [9, "mb"],  "Gmercury" => [9, "mercury"],
   "Gmgal" => [9, "mgal"],  "Gmin" => [9, "min"],  "Gmol" => [9, "mol"],
   "Gmon" => [9, "mon"],  "Gmph" => [9, "mph"],  "Gohm" => [9, "ohm"],
-  "Goz" => [9, "oz"],  "Gpc" => [9, "pc"],
-  "Gpercent" => [9, "percent"],  "Gpermil" => [9, "permil"],
-  "Gpsi" => [9, "psi"],  "Grad" => [9, "rad"],  "Gs" => [9, "s"],
-  "Gsr" => [9, "sr"],  "Gt" => [9, "t"],  "Gyr" => [9, "yr"],
-  "Julians_year" => [0, "Julian_year"],  "M%" => [6, "%"],
-  "MA" => [6, "A"],  "MAu" => [6, "Au"],  "MBq" => [6, "Bq"],
-  "MC" => [6, "C"],  "MF" => [6, "F"],  "MG" => [6, "G"],
-  "MGal" => [6, "Gal"],  "MGy" => [6, "Gy"],  "MH" => [6, "H"],
-  "MHg" => [6, "Hg"],  "MHz" => [6, "Hz"],  "MJ" => [6, "J"],
-  "MK" => [6, "K"],  "ML" => [6, "L"],  "MN" => [6, "N"],
-  "MP" => [6, "P"],  "MPa" => [6, "Pa"],  "MS" => [6, "S"],
-  "MSt" => [6, "St"],  "MSv" => [6, "Sv"],  "MT" => [6, "T"],
-  "MV" => [6, "V"],  "MW" => [6, "W"],  "MWb" => [6, "Wb"],
-  "Ma" => [6, "a"],  "Mac" => [6, "ac"],  "Matm" => [6, "atm"],
-  "Mbar" => [6, "bar"],  "Mcal" => [6, "cal"],
+  "Goz" => [9, "oz"],  "Gpc" => [9, "pc"],  "Gpsi" => [9, "psi"],
+  "Grad" => [9, "rad"],  "Gs" => [9, "s"],  "Gsr" => [9, "sr"],
+  "Gt" => [9, "t"],  "Gyr" => [9, "yr"],
+  "Julians_year" => [0, "Julian_year"],  "MA" => [6, "A"],
+  "MAu" => [6, "Au"],  "MBq" => [6, "Bq"],  "MC" => [6, "C"],
+  "MF" => [6, "F"],  "MG" => [6, "G"],  "MGal" => [6, "Gal"],
+  "MGy" => [6, "Gy"],  "MH" => [6, "H"],  "MHg" => [6, "Hg"],
+  "MHz" => [6, "Hz"],  "MJ" => [6, "J"],  "MK" => [6, "K"],
+  "ML" => [6, "L"],  "MN" => [6, "N"],  "MP" => [6, "P"],
+  "MPa" => [6, "Pa"],  "MS" => [6, "S"],  "MSt" => [6, "St"],
+  "MSv" => [6, "Sv"],  "MT" => [6, "T"],  "MV" => [6, "V"],
+  "MW" => [6, "W"],  "MWb" => [6, "Wb"],  "Ma" => [6, "a"],
+  "Mac" => [6, "ac"],  "Matm" => [6, "atm"],  "Mbar" => [6, "bar"],
+  "Mcal" => [6, "cal"],  "Mcd" => [6, "cd"],
   "Mconventional_mercury" => [6, "conventional_mercury"],
-  "Md" => [6, "d"],  "MdegC" => [6, "degC"],  "MdegF" => [6, "degF"],
+  "MdegC" => [6, "degC"],  "MdegF" => [6, "degF"],
   "Mdeg_C" => [6, "deg_C"],  "Mdeg_F" => [6, "deg_F"],
   "MdegreeC" => [6, "degreeC"],  "MdegreeF" => [6, "degreeF"],
   "Mdegree_C" => [6, "degree_C"],  "Mdegree_E" => [6, "degree_E"],
@@ -916,29 +465,28 @@ UALIASES = {
   "Mdegrees_west" => [6, "degrees_west"],  "Mdyn" => [6, "dyn"],
   "Merg" => [6, "erg"],  "Mforce" => [6, "force"],  "Mg" => [6, "g"],
   "Mgravity" => [6, "gravity"],  "Mh" => [6, "h"],  "Mhg" => [6, "hg"],
-  "Mhr" => [6, "hr"],  "Min" => [6, "in"],  "Mkg" => [6, "kg"],
-  "Mkgf" => [6, "kgf"],  "Mkph" => [6, "kph"],  "Mlb" => [6, "lb"],
-  "Mlm" => [6, "lm"],  "Mlx" => [6, "lx"],  "Mly" => [6, "ly"],
-  "Mm" => [6, "m"],  "Mmb" => [6, "mb"],  "Mmercury" => [6, "mercury"],
+  "Mhr" => [6, "hr"],  "Min" => [6, "in"],  "Mkgf" => [6, "kgf"],
+  "Mkph" => [6, "kph"],  "Mlb" => [6, "lb"],  "Mlm" => [6, "lm"],
+  "Mlx" => [6, "lx"],  "Mly" => [6, "ly"],  "Mm" => [6, "m"],
+  "Mmb" => [6, "mb"],  "Mmercury" => [6, "mercury"],
   "Mmgal" => [6, "mgal"],  "Mmin" => [6, "min"],  "Mmol" => [6, "mol"],
   "Mmon" => [6, "mon"],  "Mmph" => [6, "mph"],  "Mohm" => [6, "ohm"],
-  "Moz" => [6, "oz"],  "Mpc" => [6, "pc"],
-  "Mpercent" => [6, "percent"],  "Mpermil" => [6, "permil"],
-  "Mpsi" => [6, "psi"],  "Mrad" => [6, "rad"],  "Ms" => [6, "s"],
-  "Msr" => [6, "sr"],  "Mt" => [6, "t"],  "Myr" => [6, "yr"],
-  "P%" => [15, "%"],  "PA" => [15, "A"],  "PAu" => [15, "Au"],
-  "PBq" => [15, "Bq"],  "PC" => [15, "C"],  "PF" => [15, "F"],
-  "PG" => [15, "G"],  "PGal" => [15, "Gal"],  "PGy" => [15, "Gy"],
-  "PH" => [15, "H"],  "PHg" => [15, "Hg"],  "PHz" => [15, "Hz"],
-  "PJ" => [15, "J"],  "PK" => [15, "K"],  "PL" => [15, "L"],
-  "PN" => [15, "N"],  "PP" => [15, "P"],  "PPa" => [15, "Pa"],
-  "PS" => [15, "S"],  "PSt" => [15, "St"],  "PSv" => [15, "Sv"],
-  "PT" => [15, "T"],  "PV" => [15, "V"],  "PW" => [15, "W"],
-  "PWb" => [15, "Wb"],  "Pa" => [15, "a"],  "Pac" => [15, "ac"],
-  "Pascals" => [0, "Pascal"],  "Patm" => [15, "atm"],
-  "Pbar" => [15, "bar"],  "Pcal" => [15, "cal"],
+  "Moz" => [6, "oz"],  "Mpc" => [6, "pc"],  "Mpsi" => [6, "psi"],
+  "Mrad" => [6, "rad"],  "Ms" => [6, "s"],  "Msr" => [6, "sr"],
+  "Mt" => [6, "t"],  "Myr" => [6, "yr"],  "PA" => [15, "A"],
+  "PAu" => [15, "Au"],  "PBq" => [15, "Bq"],  "PC" => [15, "C"],
+  "PF" => [15, "F"],  "PG" => [15, "G"],  "PGal" => [15, "Gal"],
+  "PGy" => [15, "Gy"],  "PH" => [15, "H"],  "PHg" => [15, "Hg"],
+  "PHz" => [15, "Hz"],  "PJ" => [15, "J"],  "PK" => [15, "K"],
+  "PL" => [15, "L"],  "PN" => [15, "N"],  "PP" => [15, "P"],
+  "PPa" => [15, "Pa"],  "PS" => [15, "S"],  "PSt" => [15, "St"],
+  "PSv" => [15, "Sv"],  "PT" => [15, "T"],  "PV" => [15, "V"],
+  "PW" => [15, "W"],  "PWb" => [15, "Wb"],  "Pa" => [15, "a"],
+  "Pac" => [15, "ac"],  "Pascals" => [0, "Pascal"],
+  "Patm" => [15, "atm"],  "Pbar" => [15, "bar"],  "Pcal" => [15, "cal"],
+  "Pcd" => [15, "cd"],
   "Pconventional_mercury" => [15, "conventional_mercury"],
-  "Pd" => [15, "d"],  "PdegC" => [15, "degC"],  "PdegF" => [15, "degF"],
+  "PdegC" => [15, "degC"],  "PdegF" => [15, "degF"],
   "Pdeg_C" => [15, "deg_C"],  "Pdeg_F" => [15, "deg_F"],
   "PdegreeC" => [15, "degreeC"],  "PdegreeF" => [15, "degreeF"],
   "Pdegree_C" => [15, "degree_C"],  "Pdegree_E" => [15, "degree_E"],
@@ -957,28 +505,27 @@ UALIASES = {
   "Perg" => [15, "erg"],  "Pforce" => [15, "force"],  "Pg" => [15, "g"],
   "Pgravity" => [15, "gravity"],  "Ph" => [15, "h"],
   "Phg" => [15, "hg"],  "Phr" => [15, "hr"],  "Pin" => [15, "in"],
-  "Pkg" => [15, "kg"],  "Pkgf" => [15, "kgf"],  "Pkph" => [15, "kph"],
-  "Plb" => [15, "lb"],  "Plm" => [15, "lm"],  "Plx" => [15, "lx"],
-  "Ply" => [15, "ly"],  "Pm" => [15, "m"],  "Pmb" => [15, "mb"],
+  "Pkgf" => [15, "kgf"],  "Pkph" => [15, "kph"],  "Plb" => [15, "lb"],
+  "Plm" => [15, "lm"],  "Plx" => [15, "lx"],  "Ply" => [15, "ly"],
+  "Pm" => [15, "m"],  "Pmb" => [15, "mb"],
   "Pmercury" => [15, "mercury"],  "Pmgal" => [15, "mgal"],
   "Pmin" => [15, "min"],  "Pmol" => [15, "mol"],  "Pmon" => [15, "mon"],
   "Pmph" => [15, "mph"],  "Pohm" => [15, "ohm"],  "Poz" => [15, "oz"],
-  "Ppc" => [15, "pc"],  "Ppercent" => [15, "percent"],
-  "Ppermil" => [15, "permil"],  "Ppsi" => [15, "psi"],
-  "Prad" => [15, "rad"],  "Ps" => [15, "s"],  "Psr" => [15, "sr"],
-  "Pt" => [15, "t"],  "Pyr" => [15, "yr"],  "T%" => [12, "%"],
-  "TA" => [12, "A"],  "TAu" => [12, "Au"],  "TBq" => [12, "Bq"],
-  "TC" => [12, "C"],  "TF" => [12, "F"],  "TG" => [12, "G"],
-  "TGal" => [12, "Gal"],  "TGy" => [12, "Gy"],  "TH" => [12, "H"],
-  "THg" => [12, "Hg"],  "THz" => [12, "Hz"],  "TJ" => [12, "J"],
-  "TK" => [12, "K"],  "TL" => [12, "L"],  "TN" => [12, "N"],
-  "TP" => [12, "P"],  "TPa" => [12, "Pa"],  "TS" => [12, "S"],
-  "TSt" => [12, "St"],  "TSv" => [12, "Sv"],  "TT" => [12, "T"],
-  "TV" => [12, "V"],  "TW" => [12, "W"],  "TWb" => [12, "Wb"],
-  "Ta" => [12, "a"],  "Tac" => [12, "ac"],  "Tatm" => [12, "atm"],
-  "Tbar" => [12, "bar"],  "Tcal" => [12, "cal"],
+  "Ppc" => [15, "pc"],  "Ppsi" => [15, "psi"],  "Prad" => [15, "rad"],
+  "Ps" => [15, "s"],  "Psr" => [15, "sr"],  "Pt" => [15, "t"],
+  "Pyr" => [15, "yr"],  "TA" => [12, "A"],  "TAu" => [12, "Au"],
+  "TBq" => [12, "Bq"],  "TC" => [12, "C"],  "TF" => [12, "F"],
+  "TG" => [12, "G"],  "TGal" => [12, "Gal"],  "TGy" => [12, "Gy"],
+  "TH" => [12, "H"],  "THg" => [12, "Hg"],  "THz" => [12, "Hz"],
+  "TJ" => [12, "J"],  "TK" => [12, "K"],  "TL" => [12, "L"],
+  "TN" => [12, "N"],  "TP" => [12, "P"],  "TPa" => [12, "Pa"],
+  "TS" => [12, "S"],  "TSt" => [12, "St"],  "TSv" => [12, "Sv"],
+  "TT" => [12, "T"],  "TV" => [12, "V"],  "TW" => [12, "W"],
+  "TWb" => [12, "Wb"],  "Ta" => [12, "a"],  "Tac" => [12, "ac"],
+  "Tatm" => [12, "atm"],  "Tbar" => [12, "bar"],  "Tcal" => [12, "cal"],
+  "Tcd" => [12, "cd"],
   "Tconventional_mercury" => [12, "conventional_mercury"],
-  "Td" => [12, "d"],  "TdegC" => [12, "degC"],  "TdegF" => [12, "degF"],
+  "TdegC" => [12, "degC"],  "TdegF" => [12, "degF"],
   "Tdeg_C" => [12, "deg_C"],  "Tdeg_F" => [12, "deg_F"],
   "TdegreeC" => [12, "degreeC"],  "TdegreeF" => [12, "degreeF"],
   "Tdegree_C" => [12, "degree_C"],  "Tdegree_E" => [12, "degree_E"],
@@ -997,35 +544,34 @@ UALIASES = {
   "Terg" => [12, "erg"],  "Tforce" => [12, "force"],  "Tg" => [12, "g"],
   "Tgravity" => [12, "gravity"],  "Th" => [12, "h"],
   "Thg" => [12, "hg"],  "Thr" => [12, "hr"],  "Tin" => [12, "in"],
-  "Tkg" => [12, "kg"],  "Tkgf" => [12, "kgf"],  "Tkph" => [12, "kph"],
-  "Tlb" => [12, "lb"],  "Tlm" => [12, "lm"],  "Tlx" => [12, "lx"],
-  "Tly" => [12, "ly"],  "Tm" => [12, "m"],  "Tmb" => [12, "mb"],
+  "Tkgf" => [12, "kgf"],  "Tkph" => [12, "kph"],  "Tlb" => [12, "lb"],
+  "Tlm" => [12, "lm"],  "Tlx" => [12, "lx"],  "Tly" => [12, "ly"],
+  "Tm" => [12, "m"],  "Tmb" => [12, "mb"],
   "Tmercury" => [12, "mercury"],  "Tmgal" => [12, "mgal"],
   "Tmin" => [12, "min"],  "Tmol" => [12, "mol"],  "Tmon" => [12, "mon"],
   "Tmph" => [12, "mph"],  "Tohm" => [12, "ohm"],  "Toz" => [12, "oz"],
-  "Tpc" => [12, "pc"],  "Tpercent" => [12, "percent"],
-  "Tpermil" => [12, "permil"],  "Tpsi" => [12, "psi"],
-  "Trad" => [12, "rad"],  "Ts" => [12, "s"],  "Tsr" => [12, "sr"],
-  "Tt" => [12, "t"],  "Tyr" => [12, "yr"],  "a%" => [-18, "%"],
-  "aA" => [-18, "A"],  "aAu" => [-18, "Au"],  "aBq" => [-18, "Bq"],
-  "aC" => [-18, "C"],  "aF" => [-18, "F"],  "aG" => [-18, "G"],
-  "aGal" => [-18, "Gal"],  "aGy" => [-18, "Gy"],  "aH" => [-18, "H"],
-  "aHg" => [-18, "Hg"],  "aHz" => [-18, "Hz"],  "aJ" => [-18, "J"],
-  "aK" => [-18, "K"],  "aL" => [-18, "L"],  "aN" => [-18, "N"],
-  "aP" => [-18, "P"],  "aPa" => [-18, "Pa"],  "aS" => [-18, "S"],
-  "aSt" => [-18, "St"],  "aSv" => [-18, "Sv"],  "aT" => [-18, "T"],
-  "aV" => [-18, "V"],  "aW" => [-18, "W"],  "aWb" => [-18, "Wb"],
-  "aa" => [-18, "a"],  "aac" => [-18, "ac"],  "aatm" => [-18, "atm"],
-  "abar" => [-18, "bar"],  "acal" => [-18, "cal"],
+  "Tpc" => [12, "pc"],  "Tpsi" => [12, "psi"],  "Trad" => [12, "rad"],
+  "Ts" => [12, "s"],  "Tsr" => [12, "sr"],  "Tt" => [12, "t"],
+  "Tyr" => [12, "yr"],  "aA" => [-18, "A"],  "aAu" => [-18, "Au"],
+  "aBq" => [-18, "Bq"],  "aC" => [-18, "C"],  "aF" => [-18, "F"],
+  "aG" => [-18, "G"],  "aGal" => [-18, "Gal"],  "aGy" => [-18, "Gy"],
+  "aH" => [-18, "H"],  "aHg" => [-18, "Hg"],  "aHz" => [-18, "Hz"],
+  "aJ" => [-18, "J"],  "aK" => [-18, "K"],  "aL" => [-18, "L"],
+  "aN" => [-18, "N"],  "aP" => [-18, "P"],  "aPa" => [-18, "Pa"],
+  "aS" => [-18, "S"],  "aSt" => [-18, "St"],  "aSv" => [-18, "Sv"],
+  "aT" => [-18, "T"],  "aV" => [-18, "V"],  "aW" => [-18, "W"],
+  "aWb" => [-18, "Wb"],  "aa" => [-18, "a"],  "aac" => [-18, "ac"],
+  "aatm" => [-18, "atm"],  "abar" => [-18, "bar"],
+  "acal" => [-18, "cal"],  "acd" => [-18, "cd"],
   "aconventional_mercury" => [-18, "conventional_mercury"],
-  "acres" => [0, "acre"],  "ad" => [-18, "d"],
-  "adegC" => [-18, "degC"],  "adegF" => [-18, "degF"],
-  "adeg_C" => [-18, "deg_C"],  "adeg_F" => [-18, "deg_F"],
-  "adegreeC" => [-18, "degreeC"],  "adegreeF" => [-18, "degreeF"],
-  "adegree_C" => [-18, "degree_C"],  "adegree_E" => [-18, "degree_E"],
-  "adegree_F" => [-18, "degree_F"],  "adegree_N" => [-18, "degree_N"],
-  "adegree_R" => [-18, "degree_R"],  "adegree_S" => [-18, "degree_S"],
-  "adegree_W" => [-18, "degree_W"],  "adegree_c" => [-18, "degree_c"],
+  "acres" => [0, "acre"],  "adegC" => [-18, "degC"],
+  "adegF" => [-18, "degF"],  "adeg_C" => [-18, "deg_C"],
+  "adeg_F" => [-18, "deg_F"],  "adegreeC" => [-18, "degreeC"],
+  "adegreeF" => [-18, "degreeF"],  "adegree_C" => [-18, "degree_C"],
+  "adegree_E" => [-18, "degree_E"],  "adegree_F" => [-18, "degree_F"],
+  "adegree_N" => [-18, "degree_N"],  "adegree_R" => [-18, "degree_R"],
+  "adegree_S" => [-18, "degree_S"],  "adegree_W" => [-18, "degree_W"],
+  "adegree_c" => [-18, "degree_c"],
   "adegree_east" => [-18, "degree_east"],
   "adegree_f" => [-18, "degree_f"],
   "adegree_north" => [-18, "degree_north"],
@@ -1038,7 +584,7 @@ UALIASES = {
   "aerg" => [-18, "erg"],  "aforce" => [-18, "force"],
   "ag" => [-18, "g"],  "agravity" => [-18, "gravity"],
   "ah" => [-18, "h"],  "ahg" => [-18, "hg"],  "ahr" => [-18, "hr"],
-  "ain" => [-18, "in"],  "akg" => [-18, "kg"],  "akgf" => [-18, "kgf"],
+  "ain" => [-18, "in"],  "akgf" => [-18, "kgf"],
   "akph" => [-18, "kph"],  "alb" => [-18, "lb"],  "alm" => [-18, "lm"],
   "alx" => [-18, "lx"],  "aly" => [-18, "ly"],  "am" => [-18, "m"],
   "amb" => [-18, "mb"],  "amercury" => [-18, "mercury"],
@@ -1049,11 +595,10 @@ UALIASES = {
   "angulars_degree" => [0, "angular_degree"],
   "angulars_minute" => [0, "angular_minute"],
   "angulars_second" => [0, "angular_second"],  "aohm" => [-18, "ohm"],
-  "aoz" => [-18, "oz"],  "apc" => [-18, "pc"],
-  "apercent" => [-18, "percent"],  "apermil" => [-18, "permil"],
-  "apsi" => [-18, "psi"],  "arad" => [-18, "rad"],
-  "ares" => [0, "are"],  "as" => [-18, "s"],  "asr" => [-18, "sr"],
-  "at" => [-18, "t"],  "atmospheres" => [0, "atmosphere"],
+  "aoz" => [-18, "oz"],  "apc" => [-18, "pc"],  "apsi" => [-18, "psi"],
+  "arad" => [-18, "rad"],  "ares" => [0, "are"],  "as" => [-18, "s"],
+  "asr" => [-18, "sr"],  "at" => [-18, "t"],
+  "atmospheres" => [0, "atmosphere"],
   "attoCelsius" => [-18, "Celsius"],
   "attoFahrenheit" => [-18, "Fahrenheit"],
   "attoJulian_year" => [-18, "Julian_year"],
@@ -1063,7 +608,8 @@ UALIASES = {
   "attoangular_minute" => [-18, "angular_minute"],
   "attoangular_second" => [-18, "angular_second"],
   "attoare" => [-18, "are"],  "attoatmosphere" => [-18, "atmosphere"],
-  "attocalorie" => [-18, "calorie"],  "attocelsius" => [-18, "celsius"],
+  "attocalorie" => [-18, "calorie"],  "attocandela" => [-18, "candela"],
+  "attocelsius" => [-18, "celsius"],
   "attocentigrade" => [-18, "centigrade"],
   "attocentury" => [-18, "century"],  "attochain" => [-18, "chain"],
   "attocommon_year" => [-18, "common_year"],
@@ -1086,9 +632,9 @@ UALIASES = {
   "attomole" => [-18, "mole"],  "attomonth" => [-18, "month"],
   "attonewton" => [-18, "newton"],  "attoounce" => [-18, "ounce"],
   "attoparsec" => [-18, "parsec"],  "attopascal" => [-18, "pascal"],
-  "attopentad" => [-18, "pentad"],  "attopoise" => [-18, "poise"],
-  "attopound" => [-18, "pound"],  "attoradian" => [-18, "radian"],
-  "attosecond" => [-18, "second"],
+  "attopentad" => [-18, "pentad"],  "attopercent" => [-18, "percent"],
+  "attopoise" => [-18, "poise"],  "attopound" => [-18, "pound"],
+  "attoradian" => [-18, "radian"],  "attosecond" => [-18, "second"],
   "attosecond_angle" => [-18, "second_angle"],
   "attosteradian" => [-18, "steradian"],
   "attostokes" => [-18, "stokes"],  "attotesla" => [-18, "tesla"],
@@ -1097,19 +643,20 @@ UALIASES = {
   "attowatt" => [-18, "watt"],  "attoweber" => [-18, "weber"],
   "attoyard" => [-18, "yard"],  "attoyd" => [-18, "yd"],
   "attoyear" => [-18, "year"],  "ayr" => [-18, "yr"],
-  "c%" => [-2, "%"],  "cA" => [-2, "A"],  "cAu" => [-2, "Au"],
-  "cBq" => [-2, "Bq"],  "cC" => [-2, "C"],  "cF" => [-2, "F"],
-  "cG" => [-2, "G"],  "cGal" => [-2, "Gal"],  "cGy" => [-2, "Gy"],
-  "cH" => [-2, "H"],  "cHg" => [-2, "Hg"],  "cHz" => [-2, "Hz"],
-  "cJ" => [-2, "J"],  "cK" => [-2, "K"],  "cL" => [-2, "L"],
-  "cN" => [-2, "N"],  "cP" => [-2, "P"],  "cPa" => [-2, "Pa"],
-  "cS" => [-2, "S"],  "cSt" => [-2, "St"],  "cSv" => [-2, "Sv"],
-  "cT" => [-2, "T"],  "cV" => [-2, "V"],  "cW" => [-2, "W"],
-  "cWb" => [-2, "Wb"],  "ca" => [-2, "a"],  "cac" => [-2, "ac"],
-  "calories" => [0, "calorie"],  "catm" => [-2, "atm"],
-  "cbar" => [-2, "bar"],  "ccal" => [-2, "cal"],
+  "cA" => [-2, "A"],  "cAu" => [-2, "Au"],  "cBq" => [-2, "Bq"],
+  "cC" => [-2, "C"],  "cF" => [-2, "F"],  "cG" => [-2, "G"],
+  "cGal" => [-2, "Gal"],  "cGy" => [-2, "Gy"],  "cH" => [-2, "H"],
+  "cHg" => [-2, "Hg"],  "cHz" => [-2, "Hz"],  "cJ" => [-2, "J"],
+  "cK" => [-2, "K"],  "cL" => [-2, "L"],  "cN" => [-2, "N"],
+  "cP" => [-2, "P"],  "cPa" => [-2, "Pa"],  "cS" => [-2, "S"],
+  "cSt" => [-2, "St"],  "cSv" => [-2, "Sv"],  "cT" => [-2, "T"],
+  "cV" => [-2, "V"],  "cW" => [-2, "W"],  "cWb" => [-2, "Wb"],
+  "ca" => [-2, "a"],  "cac" => [-2, "ac"],
+  "calories" => [0, "calorie"],  "candelas" => [0, "candela"],
+  "catm" => [-2, "atm"],  "cbar" => [-2, "bar"],  "ccal" => [-2, "cal"],
+  "ccd" => [-2, "cd"],
   "cconventional_mercury" => [-2, "conventional_mercury"],
-  "cd" => [-2, "d"],  "cdegC" => [-2, "degC"],  "cdegF" => [-2, "degF"],
+  "cdegC" => [-2, "degC"],  "cdegF" => [-2, "degF"],
   "cdeg_C" => [-2, "deg_C"],  "cdeg_F" => [-2, "deg_F"],
   "cdegreeC" => [-2, "degreeC"],  "cdegreeF" => [-2, "degreeF"],
   "cdegree_C" => [-2, "degree_C"],  "cdegree_E" => [-2, "degree_E"],
@@ -1134,7 +681,8 @@ UALIASES = {
   "centiangular_minute" => [-2, "angular_minute"],
   "centiangular_second" => [-2, "angular_second"],
   "centiare" => [-2, "are"],  "centiatmosphere" => [-2, "atmosphere"],
-  "centicalorie" => [-2, "calorie"],  "centicelsius" => [-2, "celsius"],
+  "centicalorie" => [-2, "calorie"],  "centicandela" => [-2, "candela"],
+  "centicelsius" => [-2, "celsius"],
   "centicentigrade" => [-2, "centigrade"],
   "centicentury" => [-2, "century"],  "centichain" => [-2, "chain"],
   "centicommon_year" => [-2, "common_year"],
@@ -1158,9 +706,9 @@ UALIASES = {
   "centimole" => [-2, "mole"],  "centimonth" => [-2, "month"],
   "centinewton" => [-2, "newton"],  "centiounce" => [-2, "ounce"],
   "centiparsec" => [-2, "parsec"],  "centipascal" => [-2, "pascal"],
-  "centipentad" => [-2, "pentad"],  "centipoise" => [-2, "poise"],
-  "centipound" => [-2, "pound"],  "centiradian" => [-2, "radian"],
-  "centisecond" => [-2, "second"],
+  "centipentad" => [-2, "pentad"],  "centipercent" => [-2, "percent"],
+  "centipoise" => [-2, "poise"],  "centipound" => [-2, "pound"],
+  "centiradian" => [-2, "radian"],  "centisecond" => [-2, "second"],
   "centisecond_angle" => [-2, "second_angle"],
   "centisteradian" => [-2, "steradian"],
   "centistokes" => [-2, "stokes"],  "centitesla" => [-2, "tesla"],
@@ -1172,39 +720,37 @@ UALIASES = {
   "cerg" => [-2, "erg"],  "cforce" => [-2, "force"],  "cg" => [-2, "g"],
   "cgravity" => [-2, "gravity"],  "ch" => [-2, "h"],
   "chains" => [0, "chain"],  "chg" => [-2, "hg"],  "chr" => [-2, "hr"],
-  "cin" => [-2, "in"],  "ckg" => [-2, "kg"],  "ckgf" => [-2, "kgf"],
-  "ckph" => [-2, "kph"],  "clb" => [-2, "lb"],  "clm" => [-2, "lm"],
-  "clx" => [-2, "lx"],  "cly" => [-2, "ly"],  "cm" => [-2, "m"],
-  "cmb" => [-2, "mb"],  "cmercury" => [-2, "mercury"],
-  "cmgal" => [-2, "mgal"],  "cmin" => [-2, "min"],
-  "cmol" => [-2, "mol"],  "cmon" => [-2, "mon"],  "cmph" => [-2, "mph"],
-  "cohm" => [-2, "ohm"],  "commons_year" => [0, "common_year"],
-  "coulombs" => [0, "coulomb"],  "coz" => [-2, "oz"],
-  "cpc" => [-2, "pc"],  "cpercent" => [-2, "percent"],
-  "cpermil" => [-2, "permil"],  "cpsi" => [-2, "psi"],
+  "cin" => [-2, "in"],  "ckgf" => [-2, "kgf"],  "ckph" => [-2, "kph"],
+  "clb" => [-2, "lb"],  "clm" => [-2, "lm"],  "clx" => [-2, "lx"],
+  "cly" => [-2, "ly"],  "cm" => [-2, "m"],  "cmb" => [-2, "mb"],
+  "cmercury" => [-2, "mercury"],  "cmgal" => [-2, "mgal"],
+  "cmin" => [-2, "min"],  "cmol" => [-2, "mol"],  "cmon" => [-2, "mon"],
+  "cmph" => [-2, "mph"],  "cohm" => [-2, "ohm"],
+  "commons_year" => [0, "common_year"],  "coulombs" => [0, "coulomb"],
+  "coz" => [-2, "oz"],  "cpc" => [-2, "pc"],  "cpsi" => [-2, "psi"],
   "crad" => [-2, "rad"],  "cs" => [-2, "s"],  "csr" => [-2, "sr"],
-  "ct" => [-2, "t"],  "cyr" => [-2, "yr"],  "d%" => [-1, "%"],
-  "dA" => [-1, "A"],  "dAu" => [-1, "Au"],  "dBq" => [-1, "Bq"],
-  "dC" => [-1, "C"],  "dF" => [-1, "F"],  "dG" => [-1, "G"],
-  "dGal" => [-1, "Gal"],  "dGy" => [-1, "Gy"],  "dH" => [-1, "H"],
-  "dHg" => [-1, "Hg"],  "dHz" => [-1, "Hz"],  "dJ" => [-1, "J"],
-  "dK" => [-1, "K"],  "dL" => [-1, "L"],  "dN" => [-1, "N"],
-  "dP" => [-1, "P"],  "dPa" => [-1, "Pa"],  "dS" => [-1, "S"],
-  "dSt" => [-1, "St"],  "dSv" => [-1, "Sv"],  "dT" => [-1, "T"],
-  "dV" => [-1, "V"],  "dW" => [-1, "W"],  "dWb" => [-1, "Wb"],
-  "da" => [-1, "a"],  "da%" => [1, "%"],  "daA" => [1, "A"],
-  "daAu" => [1, "Au"],  "daBq" => [1, "Bq"],  "daC" => [1, "C"],
-  "daF" => [1, "F"],  "daG" => [1, "G"],  "daGal" => [1, "Gal"],
-  "daGy" => [1, "Gy"],  "daH" => [1, "H"],  "daHg" => [1, "Hg"],
-  "daHz" => [1, "Hz"],  "daJ" => [1, "J"],  "daK" => [1, "K"],
-  "daL" => [1, "L"],  "daN" => [1, "N"],  "daP" => [1, "P"],
-  "daPa" => [1, "Pa"],  "daS" => [1, "S"],  "daSt" => [1, "St"],
-  "daSv" => [1, "Sv"],  "daT" => [1, "T"],  "daV" => [1, "V"],
-  "daW" => [1, "W"],  "daWb" => [1, "Wb"],  "daa" => [1, "a"],
-  "daac" => [1, "ac"],  "daatm" => [1, "atm"],  "dabar" => [1, "bar"],
-  "dac" => [-1, "ac"],  "dacal" => [1, "cal"],
+  "ct" => [-2, "t"],  "cyr" => [-2, "yr"],  "dA" => [-1, "A"],
+  "dAu" => [-1, "Au"],  "dBq" => [-1, "Bq"],  "dC" => [-1, "C"],
+  "dF" => [-1, "F"],  "dG" => [-1, "G"],  "dGal" => [-1, "Gal"],
+  "dGy" => [-1, "Gy"],  "dH" => [-1, "H"],  "dHg" => [-1, "Hg"],
+  "dHz" => [-1, "Hz"],  "dJ" => [-1, "J"],  "dK" => [-1, "K"],
+  "dL" => [-1, "L"],  "dN" => [-1, "N"],  "dP" => [-1, "P"],
+  "dPa" => [-1, "Pa"],  "dS" => [-1, "S"],  "dSt" => [-1, "St"],
+  "dSv" => [-1, "Sv"],  "dT" => [-1, "T"],  "dV" => [-1, "V"],
+  "dW" => [-1, "W"],  "dWb" => [-1, "Wb"],  "da" => [-1, "a"],
+  "daA" => [1, "A"],  "daAu" => [1, "Au"],  "daBq" => [1, "Bq"],
+  "daC" => [1, "C"],  "daF" => [1, "F"],  "daG" => [1, "G"],
+  "daGal" => [1, "Gal"],  "daGy" => [1, "Gy"],  "daH" => [1, "H"],
+  "daHg" => [1, "Hg"],  "daHz" => [1, "Hz"],  "daJ" => [1, "J"],
+  "daK" => [1, "K"],  "daL" => [1, "L"],  "daN" => [1, "N"],
+  "daP" => [1, "P"],  "daPa" => [1, "Pa"],  "daS" => [1, "S"],
+  "daSt" => [1, "St"],  "daSv" => [1, "Sv"],  "daT" => [1, "T"],
+  "daV" => [1, "V"],  "daW" => [1, "W"],  "daWb" => [1, "Wb"],
+  "daa" => [1, "a"],  "daac" => [1, "ac"],  "daatm" => [1, "atm"],
+  "dabar" => [1, "bar"],  "dac" => [-1, "ac"],  "dacal" => [1, "cal"],
+  "dacd" => [1, "cd"],
   "daconventional_mercury" => [1, "conventional_mercury"],
-  "dad" => [1, "d"],  "dadegC" => [1, "degC"],  "dadegF" => [1, "degF"],
+  "dadegC" => [1, "degC"],  "dadegF" => [1, "degF"],
   "dadeg_C" => [1, "deg_C"],  "dadeg_F" => [1, "deg_F"],
   "dadegreeC" => [1, "degreeC"],  "dadegreeF" => [1, "degreeF"],
   "dadegree_C" => [1, "degree_C"],  "dadegree_E" => [1, "degree_E"],
@@ -1223,19 +769,18 @@ UALIASES = {
   "daerg" => [1, "erg"],  "daforce" => [1, "force"],  "dag" => [1, "g"],
   "dagravity" => [1, "gravity"],  "dah" => [1, "h"],
   "dahg" => [1, "hg"],  "dahr" => [1, "hr"],  "dain" => [1, "in"],
-  "dakg" => [1, "kg"],  "dakgf" => [1, "kgf"],  "dakph" => [1, "kph"],
-  "dalb" => [1, "lb"],  "dalm" => [1, "lm"],  "dalx" => [1, "lx"],
-  "daly" => [1, "ly"],  "dam" => [1, "m"],  "damb" => [1, "mb"],
+  "dakgf" => [1, "kgf"],  "dakph" => [1, "kph"],  "dalb" => [1, "lb"],
+  "dalm" => [1, "lm"],  "dalx" => [1, "lx"],  "daly" => [1, "ly"],
+  "dam" => [1, "m"],  "damb" => [1, "mb"],
   "damercury" => [1, "mercury"],  "damgal" => [1, "mgal"],
   "damin" => [1, "min"],  "damol" => [1, "mol"],  "damon" => [1, "mon"],
   "damph" => [1, "mph"],  "daohm" => [1, "ohm"],  "daoz" => [1, "oz"],
-  "dapc" => [1, "pc"],  "dapercent" => [1, "percent"],
-  "dapermil" => [1, "permil"],  "dapsi" => [1, "psi"],
-  "darad" => [1, "rad"],  "das" => [1, "s"],  "dasr" => [1, "sr"],
-  "dat" => [1, "t"],  "datm" => [-1, "atm"],  "dayr" => [1, "yr"],
-  "days" => [0, "day"],  "dbar" => [-1, "bar"],  "dcal" => [-1, "cal"],
+  "dapc" => [1, "pc"],  "dapsi" => [1, "psi"],  "darad" => [1, "rad"],
+  "das" => [1, "s"],  "dasr" => [1, "sr"],  "dat" => [1, "t"],
+  "datm" => [-1, "atm"],  "dayr" => [1, "yr"],  "days" => [0, "day"],
+  "dbar" => [-1, "bar"],  "dcal" => [-1, "cal"],  "dcd" => [-1, "cd"],
   "dconventional_mercury" => [-1, "conventional_mercury"],
-  "dd" => [-1, "d"],  "ddegC" => [-1, "degC"],  "ddegF" => [-1, "degF"],
+  "ddegC" => [-1, "degC"],  "ddegF" => [-1, "degF"],
   "ddeg_C" => [-1, "deg_C"],  "ddeg_F" => [-1, "deg_F"],
   "ddegreeC" => [-1, "degreeC"],  "ddegreeF" => [-1, "degreeF"],
   "ddegree_C" => [-1, "degree_C"],  "ddegree_E" => [-1, "degree_E"],
@@ -1260,7 +805,8 @@ UALIASES = {
   "decaangular_minute" => [1, "angular_minute"],
   "decaangular_second" => [1, "angular_second"],
   "decaare" => [1, "are"],  "decaatmosphere" => [1, "atmosphere"],
-  "decacalorie" => [1, "calorie"],  "decacelsius" => [1, "celsius"],
+  "decacalorie" => [1, "calorie"],  "decacandela" => [1, "candela"],
+  "decacelsius" => [1, "celsius"],
   "decacentigrade" => [1, "centigrade"],
   "decacentury" => [1, "century"],  "decachain" => [1, "chain"],
   "decacommon_year" => [1, "common_year"],
@@ -1283,8 +829,9 @@ UALIASES = {
   "decamonth" => [1, "month"],  "decanewton" => [1, "newton"],
   "decaounce" => [1, "ounce"],  "decaparsec" => [1, "parsec"],
   "decapascal" => [1, "pascal"],  "decapentad" => [1, "pentad"],
-  "decapoise" => [1, "poise"],  "decapound" => [1, "pound"],
-  "decaradian" => [1, "radian"],  "decasecond" => [1, "second"],
+  "decapercent" => [1, "percent"],  "decapoise" => [1, "poise"],
+  "decapound" => [1, "pound"],  "decaradian" => [1, "radian"],
+  "decasecond" => [1, "second"],
   "decasecond_angle" => [1, "second_angle"],
   "decasteradian" => [1, "steradian"],  "decastokes" => [1, "stokes"],
   "decatesla" => [1, "tesla"],  "decaton" => [1, "ton"],
@@ -1301,7 +848,8 @@ UALIASES = {
   "deciangular_minute" => [-1, "angular_minute"],
   "deciangular_second" => [-1, "angular_second"],
   "deciare" => [-1, "are"],  "deciatmosphere" => [-1, "atmosphere"],
-  "decicalorie" => [-1, "calorie"],  "decicelsius" => [-1, "celsius"],
+  "decicalorie" => [-1, "calorie"],  "decicandela" => [-1, "candela"],
+  "decicelsius" => [-1, "celsius"],
   "decicentigrade" => [-1, "centigrade"],
   "decicentury" => [-1, "century"],  "decichain" => [-1, "chain"],
   "decicommon_year" => [-1, "common_year"],
@@ -1324,9 +872,9 @@ UALIASES = {
   "decimole" => [-1, "mole"],  "decimonth" => [-1, "month"],
   "decinewton" => [-1, "newton"],  "deciounce" => [-1, "ounce"],
   "deciparsec" => [-1, "parsec"],  "decipascal" => [-1, "pascal"],
-  "decipentad" => [-1, "pentad"],  "decipoise" => [-1, "poise"],
-  "decipound" => [-1, "pound"],  "deciradian" => [-1, "radian"],
-  "decisecond" => [-1, "second"],
+  "decipentad" => [-1, "pentad"],  "decipercent" => [-1, "percent"],
+  "decipoise" => [-1, "poise"],  "decipound" => [-1, "pound"],
+  "deciradian" => [-1, "radian"],  "decisecond" => [-1, "second"],
   "decisecond_angle" => [-1, "second_angle"],
   "decisteradian" => [-1, "steradian"],  "decistokes" => [-1, "stokes"],
   "decitesla" => [-1, "tesla"],  "deciton" => [-1, "ton"],
@@ -1339,17 +887,16 @@ UALIASES = {
   "derg" => [-1, "erg"],  "dforce" => [-1, "force"],  "dg" => [-1, "g"],
   "dgravity" => [-1, "gravity"],  "dh" => [-1, "h"],
   "dhg" => [-1, "hg"],  "dhr" => [-1, "hr"],  "din" => [-1, "in"],
-  "dkg" => [-1, "kg"],  "dkgf" => [-1, "kgf"],  "dkph" => [-1, "kph"],
-  "dlb" => [-1, "lb"],  "dlm" => [-1, "lm"],  "dlx" => [-1, "lx"],
-  "dly" => [-1, "ly"],  "dm" => [-1, "m"],  "dmb" => [-1, "mb"],
+  "dkgf" => [-1, "kgf"],  "dkph" => [-1, "kph"],  "dlb" => [-1, "lb"],
+  "dlm" => [-1, "lm"],  "dlx" => [-1, "lx"],  "dly" => [-1, "ly"],
+  "dm" => [-1, "m"],  "dmb" => [-1, "mb"],
   "dmercury" => [-1, "mercury"],  "dmgal" => [-1, "mgal"],
   "dmin" => [-1, "min"],  "dmol" => [-1, "mol"],  "dmon" => [-1, "mon"],
   "dmph" => [-1, "mph"],  "dohm" => [-1, "ohm"],  "doz" => [-1, "oz"],
-  "dpc" => [-1, "pc"],  "dpercent" => [-1, "percent"],
-  "dpermil" => [-1, "permil"],  "dpsi" => [-1, "psi"],
-  "drad" => [-1, "rad"],  "ds" => [-1, "s"],  "dsr" => [-1, "sr"],
-  "dt" => [-1, "t"],  "dynes" => [0, "dyne"],  "dyr" => [-1, "yr"],
-  "ergs" => [0, "erg"],  "exaCelsius" => [18, "Celsius"],
+  "dpc" => [-1, "pc"],  "dpsi" => [-1, "psi"],  "drad" => [-1, "rad"],
+  "ds" => [-1, "s"],  "dsr" => [-1, "sr"],  "dt" => [-1, "t"],
+  "dynes" => [0, "dyne"],  "dyr" => [-1, "yr"],  "ergs" => [0, "erg"],
+  "exaCelsius" => [18, "Celsius"],
   "exaFahrenheit" => [18, "Fahrenheit"],
   "exaJulian_year" => [18, "Julian_year"],
   "exaPascal" => [18, "Pascal"],  "exaacre" => [18, "acre"],
@@ -1358,7 +905,8 @@ UALIASES = {
   "exaangular_minute" => [18, "angular_minute"],
   "exaangular_second" => [18, "angular_second"],
   "exaare" => [18, "are"],  "exaatmosphere" => [18, "atmosphere"],
-  "exacalorie" => [18, "calorie"],  "exacelsius" => [18, "celsius"],
+  "exacalorie" => [18, "calorie"],  "exacandela" => [18, "candela"],
+  "exacelsius" => [18, "celsius"],
   "exacentigrade" => [18, "centigrade"],
   "exacentury" => [18, "century"],  "exachain" => [18, "chain"],
   "exacommon_year" => [18, "common_year"],
@@ -1381,8 +929,9 @@ UALIASES = {
   "examonth" => [18, "month"],  "exanewton" => [18, "newton"],
   "exaounce" => [18, "ounce"],  "exaparsec" => [18, "parsec"],
   "exapascal" => [18, "pascal"],  "exapentad" => [18, "pentad"],
-  "exapoise" => [18, "poise"],  "exapound" => [18, "pound"],
-  "exaradian" => [18, "radian"],  "exasecond" => [18, "second"],
+  "exapercent" => [18, "percent"],  "exapoise" => [18, "poise"],
+  "exapound" => [18, "pound"],  "exaradian" => [18, "radian"],
+  "exasecond" => [18, "second"],
   "exasecond_angle" => [18, "second_angle"],
   "exasteradian" => [18, "steradian"],  "exastokes" => [18, "stokes"],
   "exatesla" => [18, "tesla"],  "exaton" => [18, "ton"],
@@ -1390,27 +939,26 @@ UALIASES = {
   "exavolt" => [18, "volt"],  "exawatt" => [18, "watt"],
   "exaweber" => [18, "weber"],  "exayard" => [18, "yard"],
   "exayd" => [18, "yd"],  "exayear" => [18, "year"],
-  "f%" => [-15, "%"],  "fA" => [-15, "A"],  "fAu" => [-15, "Au"],
-  "fBq" => [-15, "Bq"],  "fC" => [-15, "C"],  "fF" => [-15, "F"],
-  "fG" => [-15, "G"],  "fGal" => [-15, "Gal"],  "fGy" => [-15, "Gy"],
-  "fH" => [-15, "H"],  "fHg" => [-15, "Hg"],  "fHz" => [-15, "Hz"],
-  "fJ" => [-15, "J"],  "fK" => [-15, "K"],  "fL" => [-15, "L"],
-  "fN" => [-15, "N"],  "fP" => [-15, "P"],  "fPa" => [-15, "Pa"],
-  "fS" => [-15, "S"],  "fSt" => [-15, "St"],  "fSv" => [-15, "Sv"],
-  "fT" => [-15, "T"],  "fV" => [-15, "V"],  "fW" => [-15, "W"],
-  "fWb" => [-15, "Wb"],  "fa" => [-15, "a"],  "fac" => [-15, "ac"],
+  "fA" => [-15, "A"],  "fAu" => [-15, "Au"],  "fBq" => [-15, "Bq"],
+  "fC" => [-15, "C"],  "fF" => [-15, "F"],  "fG" => [-15, "G"],
+  "fGal" => [-15, "Gal"],  "fGy" => [-15, "Gy"],  "fH" => [-15, "H"],
+  "fHg" => [-15, "Hg"],  "fHz" => [-15, "Hz"],  "fJ" => [-15, "J"],
+  "fK" => [-15, "K"],  "fL" => [-15, "L"],  "fN" => [-15, "N"],
+  "fP" => [-15, "P"],  "fPa" => [-15, "Pa"],  "fS" => [-15, "S"],
+  "fSt" => [-15, "St"],  "fSv" => [-15, "Sv"],  "fT" => [-15, "T"],
+  "fV" => [-15, "V"],  "fW" => [-15, "W"],  "fWb" => [-15, "Wb"],
+  "fa" => [-15, "a"],  "fac" => [-15, "ac"],
   "fahrenheits" => [0, "fahrenheit"],  "farads" => [0, "farad"],
   "fatm" => [-15, "atm"],  "fbar" => [-15, "bar"],
-  "fcal" => [-15, "cal"],
+  "fcal" => [-15, "cal"],  "fcd" => [-15, "cd"],
   "fconventional_mercury" => [-15, "conventional_mercury"],
-  "fd" => [-15, "d"],  "fdegC" => [-15, "degC"],
-  "fdegF" => [-15, "degF"],  "fdeg_C" => [-15, "deg_C"],
-  "fdeg_F" => [-15, "deg_F"],  "fdegreeC" => [-15, "degreeC"],
-  "fdegreeF" => [-15, "degreeF"],  "fdegree_C" => [-15, "degree_C"],
-  "fdegree_E" => [-15, "degree_E"],  "fdegree_F" => [-15, "degree_F"],
-  "fdegree_N" => [-15, "degree_N"],  "fdegree_R" => [-15, "degree_R"],
-  "fdegree_S" => [-15, "degree_S"],  "fdegree_W" => [-15, "degree_W"],
-  "fdegree_c" => [-15, "degree_c"],
+  "fdegC" => [-15, "degC"],  "fdegF" => [-15, "degF"],
+  "fdeg_C" => [-15, "deg_C"],  "fdeg_F" => [-15, "deg_F"],
+  "fdegreeC" => [-15, "degreeC"],  "fdegreeF" => [-15, "degreeF"],
+  "fdegree_C" => [-15, "degree_C"],  "fdegree_E" => [-15, "degree_E"],
+  "fdegree_F" => [-15, "degree_F"],  "fdegree_N" => [-15, "degree_N"],
+  "fdegree_R" => [-15, "degree_R"],  "fdegree_S" => [-15, "degree_S"],
+  "fdegree_W" => [-15, "degree_W"],  "fdegree_c" => [-15, "degree_c"],
   "fdegree_east" => [-15, "degree_east"],
   "fdegree_f" => [-15, "degree_f"],
   "fdegree_north" => [-15, "degree_north"],
@@ -1431,6 +979,7 @@ UALIASES = {
   "femtoangular_second" => [-15, "angular_second"],
   "femtoare" => [-15, "are"],  "femtoatmosphere" => [-15, "atmosphere"],
   "femtocalorie" => [-15, "calorie"],
+  "femtocandela" => [-15, "candela"],
   "femtocelsius" => [-15, "celsius"],
   "femtocentigrade" => [-15, "centigrade"],
   "femtocentury" => [-15, "century"],  "femtochain" => [-15, "chain"],
@@ -1455,9 +1004,9 @@ UALIASES = {
   "femtomole" => [-15, "mole"],  "femtomonth" => [-15, "month"],
   "femtonewton" => [-15, "newton"],  "femtoounce" => [-15, "ounce"],
   "femtoparsec" => [-15, "parsec"],  "femtopascal" => [-15, "pascal"],
-  "femtopentad" => [-15, "pentad"],  "femtopoise" => [-15, "poise"],
-  "femtopound" => [-15, "pound"],  "femtoradian" => [-15, "radian"],
-  "femtosecond" => [-15, "second"],
+  "femtopentad" => [-15, "pentad"],  "femtopercent" => [-15, "percent"],
+  "femtopoise" => [-15, "poise"],  "femtopound" => [-15, "pound"],
+  "femtoradian" => [-15, "radian"],  "femtosecond" => [-15, "second"],
   "femtosecond_angle" => [-15, "second_angle"],
   "femtosteradian" => [-15, "steradian"],
   "femtostokes" => [-15, "stokes"],  "femtotesla" => [-15, "tesla"],
@@ -1469,19 +1018,17 @@ UALIASES = {
   "fermis" => [0, "fermi"],  "fforce" => [-15, "force"],
   "fg" => [-15, "g"],  "fgravity" => [-15, "gravity"],
   "fh" => [-15, "h"],  "fhg" => [-15, "hg"],  "fhr" => [-15, "hr"],
-  "fin" => [-15, "in"],  "fkg" => [-15, "kg"],  "fkgf" => [-15, "kgf"],
+  "fin" => [-15, "in"],  "fkgf" => [-15, "kgf"],
   "fkph" => [-15, "kph"],  "flb" => [-15, "lb"],  "flm" => [-15, "lm"],
   "flx" => [-15, "lx"],  "fly" => [-15, "ly"],  "fm" => [-15, "m"],
   "fmb" => [-15, "mb"],  "fmercury" => [-15, "mercury"],
   "fmgal" => [-15, "mgal"],  "fmin" => [-15, "min"],
   "fmol" => [-15, "mol"],  "fmon" => [-15, "mon"],
   "fmph" => [-15, "mph"],  "fohm" => [-15, "ohm"],
-  "foz" => [-15, "oz"],  "fpc" => [-15, "pc"],
-  "fpercent" => [-15, "percent"],  "fpermil" => [-15, "permil"],
-  "fpsi" => [-15, "psi"],  "frad" => [-15, "rad"],  "fs" => [-15, "s"],
-  "fsr" => [-15, "sr"],  "ft" => [-15, "t"],  "fyr" => [-15, "yr"],
-  "gals" => [0, "gal"],  "gausses" => [0, "gauss"],
-  "gigaCelsius" => [9, "Celsius"],
+  "foz" => [-15, "oz"],  "fpc" => [-15, "pc"],  "fpsi" => [-15, "psi"],
+  "frad" => [-15, "rad"],  "fs" => [-15, "s"],  "fsr" => [-15, "sr"],
+  "ft" => [-15, "t"],  "fyr" => [-15, "yr"],  "gals" => [0, "gal"],
+  "gausses" => [0, "gauss"],  "gigaCelsius" => [9, "Celsius"],
   "gigaFahrenheit" => [9, "Fahrenheit"],
   "gigaJulian_year" => [9, "Julian_year"],
   "gigaPascal" => [9, "Pascal"],  "gigaacre" => [9, "acre"],
@@ -1490,7 +1037,8 @@ UALIASES = {
   "gigaangular_minute" => [9, "angular_minute"],
   "gigaangular_second" => [9, "angular_second"],
   "gigaare" => [9, "are"],  "gigaatmosphere" => [9, "atmosphere"],
-  "gigacalorie" => [9, "calorie"],  "gigacelsius" => [9, "celsius"],
+  "gigacalorie" => [9, "calorie"],  "gigacandela" => [9, "candela"],
+  "gigacelsius" => [9, "celsius"],
   "gigacentigrade" => [9, "centigrade"],
   "gigacentury" => [9, "century"],  "gigachain" => [9, "chain"],
   "gigacommon_year" => [9, "common_year"],
@@ -1513,8 +1061,9 @@ UALIASES = {
   "gigamonth" => [9, "month"],  "giganewton" => [9, "newton"],
   "gigaounce" => [9, "ounce"],  "gigaparsec" => [9, "parsec"],
   "gigapascal" => [9, "pascal"],  "gigapentad" => [9, "pentad"],
-  "gigapoise" => [9, "poise"],  "gigapound" => [9, "pound"],
-  "gigaradian" => [9, "radian"],  "gigasecond" => [9, "second"],
+  "gigapercent" => [9, "percent"],  "gigapoise" => [9, "poise"],
+  "gigapound" => [9, "pound"],  "gigaradian" => [9, "radian"],
+  "gigasecond" => [9, "second"],
   "gigasecond_angle" => [9, "second_angle"],
   "gigasteradian" => [9, "steradian"],  "gigastokes" => [9, "stokes"],
   "gigatesla" => [9, "tesla"],  "gigaton" => [9, "ton"],
@@ -1522,19 +1071,19 @@ UALIASES = {
   "gigavolt" => [9, "volt"],  "gigawatt" => [9, "watt"],
   "gigaweber" => [9, "weber"],  "gigayard" => [9, "yard"],
   "gigayd" => [9, "yd"],  "gigayear" => [9, "year"],
-  "grams" => [0, "gram"],  "h%" => [2, "%"],  "hA" => [2, "A"],
-  "hAu" => [2, "Au"],  "hBq" => [2, "Bq"],  "hC" => [2, "C"],
-  "hF" => [2, "F"],  "hG" => [2, "G"],  "hGal" => [2, "Gal"],
-  "hGy" => [2, "Gy"],  "hH" => [2, "H"],  "hHg" => [2, "Hg"],
-  "hHz" => [2, "Hz"],  "hJ" => [2, "J"],  "hK" => [2, "K"],
-  "hL" => [2, "L"],  "hN" => [2, "N"],  "hP" => [2, "P"],
-  "hPa" => [2, "Pa"],  "hS" => [2, "S"],  "hSt" => [2, "St"],
-  "hSv" => [2, "Sv"],  "hT" => [2, "T"],  "hV" => [2, "V"],
-  "hW" => [2, "W"],  "hWb" => [2, "Wb"],  "ha" => [2, "a"],
-  "hac" => [2, "ac"],  "hatm" => [2, "atm"],  "hbar" => [2, "bar"],
-  "hcal" => [2, "cal"],
+  "grams" => [0, "gram"],  "hA" => [2, "A"],  "hAu" => [2, "Au"],
+  "hBq" => [2, "Bq"],  "hC" => [2, "C"],  "hF" => [2, "F"],
+  "hG" => [2, "G"],  "hGal" => [2, "Gal"],  "hGy" => [2, "Gy"],
+  "hH" => [2, "H"],  "hHg" => [2, "Hg"],  "hHz" => [2, "Hz"],
+  "hJ" => [2, "J"],  "hK" => [2, "K"],  "hL" => [2, "L"],
+  "hN" => [2, "N"],  "hP" => [2, "P"],  "hPa" => [2, "Pa"],
+  "hS" => [2, "S"],  "hSt" => [2, "St"],  "hSv" => [2, "Sv"],
+  "hT" => [2, "T"],  "hV" => [2, "V"],  "hW" => [2, "W"],
+  "hWb" => [2, "Wb"],  "ha" => [2, "a"],  "hac" => [2, "ac"],
+  "hatm" => [2, "atm"],  "hbar" => [2, "bar"],  "hcal" => [2, "cal"],
+  "hcd" => [2, "cd"],
   "hconventional_mercury" => [2, "conventional_mercury"],
-  "hd" => [2, "d"],  "hdegC" => [2, "degC"],  "hdegF" => [2, "degF"],
+  "hdegC" => [2, "degC"],  "hdegF" => [2, "degF"],
   "hdeg_C" => [2, "deg_C"],  "hdeg_F" => [2, "deg_F"],
   "hdegreeC" => [2, "degreeC"],  "hdegreeF" => [2, "degreeF"],
   "hdegree_C" => [2, "degree_C"],  "hdegree_E" => [2, "degree_E"],
@@ -1558,7 +1107,8 @@ UALIASES = {
   "hectoangular_minute" => [2, "angular_minute"],
   "hectoangular_second" => [2, "angular_second"],
   "hectoare" => [2, "are"],  "hectoatmosphere" => [2, "atmosphere"],
-  "hectocalorie" => [2, "calorie"],  "hectocelsius" => [2, "celsius"],
+  "hectocalorie" => [2, "calorie"],  "hectocandela" => [2, "candela"],
+  "hectocelsius" => [2, "celsius"],
   "hectocentigrade" => [2, "centigrade"],
   "hectocentury" => [2, "century"],  "hectochain" => [2, "chain"],
   "hectocommon_year" => [2, "common_year"],
@@ -1581,9 +1131,9 @@ UALIASES = {
   "hectomole" => [2, "mole"],  "hectomonth" => [2, "month"],
   "hectonewton" => [2, "newton"],  "hectoounce" => [2, "ounce"],
   "hectoparsec" => [2, "parsec"],  "hectopascal" => [2, "pascal"],
-  "hectopentad" => [2, "pentad"],  "hectopoise" => [2, "poise"],
-  "hectopound" => [2, "pound"],  "hectoradian" => [2, "radian"],
-  "hectosecond" => [2, "second"],
+  "hectopentad" => [2, "pentad"],  "hectopercent" => [2, "percent"],
+  "hectopoise" => [2, "poise"],  "hectopound" => [2, "pound"],
+  "hectoradian" => [2, "radian"],  "hectosecond" => [2, "second"],
   "hectosecond_angle" => [2, "second_angle"],
   "hectosteradian" => [2, "steradian"],  "hectostokes" => [2, "stokes"],
   "hectotesla" => [2, "tesla"],  "hectoton" => [2, "ton"],
@@ -1594,29 +1144,28 @@ UALIASES = {
   "herg" => [2, "erg"],  "hertzes" => [0, "hertz"],
   "hforce" => [2, "force"],  "hg" => [2, "g"],
   "hgravity" => [2, "gravity"],  "hh" => [2, "h"],  "hhg" => [2, "hg"],
-  "hhr" => [2, "hr"],  "hin" => [2, "in"],  "hkg" => [2, "kg"],
-  "hkgf" => [2, "kgf"],  "hkph" => [2, "kph"],  "hlb" => [2, "lb"],
-  "hlm" => [2, "lm"],  "hlx" => [2, "lx"],  "hly" => [2, "ly"],
-  "hm" => [2, "m"],  "hmb" => [2, "mb"],  "hmercury" => [2, "mercury"],
+  "hhr" => [2, "hr"],  "hin" => [2, "in"],  "hkgf" => [2, "kgf"],
+  "hkph" => [2, "kph"],  "hlb" => [2, "lb"],  "hlm" => [2, "lm"],
+  "hlx" => [2, "lx"],  "hly" => [2, "ly"],  "hm" => [2, "m"],
+  "hmb" => [2, "mb"],  "hmercury" => [2, "mercury"],
   "hmgal" => [2, "mgal"],  "hmin" => [2, "min"],  "hmol" => [2, "mol"],
   "hmon" => [2, "mon"],  "hmph" => [2, "mph"],  "hohm" => [2, "ohm"],
   "hours" => [0, "hour"],  "hoz" => [2, "oz"],  "hpc" => [2, "pc"],
-  "hpercent" => [2, "percent"],  "hpermil" => [2, "permil"],
   "hpsi" => [2, "psi"],  "hrad" => [2, "rad"],  "hs" => [2, "s"],
   "hsr" => [2, "sr"],  "ht" => [2, "t"],  "hyr" => [2, "yr"],
-  "inchs" => [0, "inch"],  "joules" => [0, "joule"],  "k%" => [3, "%"],
-  "kA" => [3, "A"],  "kAu" => [3, "Au"],  "kBq" => [3, "Bq"],
-  "kC" => [3, "C"],  "kF" => [3, "F"],  "kG" => [3, "G"],
-  "kGal" => [3, "Gal"],  "kGy" => [3, "Gy"],  "kH" => [3, "H"],
-  "kHg" => [3, "Hg"],  "kHz" => [3, "Hz"],  "kJ" => [3, "J"],
-  "kK" => [3, "K"],  "kL" => [3, "L"],  "kN" => [3, "N"],
-  "kP" => [3, "P"],  "kPa" => [3, "Pa"],  "kS" => [3, "S"],
-  "kSt" => [3, "St"],  "kSv" => [3, "Sv"],  "kT" => [3, "T"],
-  "kV" => [3, "V"],  "kW" => [3, "W"],  "kWb" => [3, "Wb"],
-  "ka" => [3, "a"],  "kac" => [3, "ac"],  "katm" => [3, "atm"],
-  "kbar" => [3, "bar"],  "kcal" => [3, "cal"],
+  "inchs" => [0, "inch"],  "joules" => [0, "joule"],  "kA" => [3, "A"],
+  "kAu" => [3, "Au"],  "kBq" => [3, "Bq"],  "kC" => [3, "C"],
+  "kF" => [3, "F"],  "kG" => [3, "G"],  "kGal" => [3, "Gal"],
+  "kGy" => [3, "Gy"],  "kH" => [3, "H"],  "kHg" => [3, "Hg"],
+  "kHz" => [3, "Hz"],  "kJ" => [3, "J"],  "kK" => [3, "K"],
+  "kL" => [3, "L"],  "kN" => [3, "N"],  "kP" => [3, "P"],
+  "kPa" => [3, "Pa"],  "kS" => [3, "S"],  "kSt" => [3, "St"],
+  "kSv" => [3, "Sv"],  "kT" => [3, "T"],  "kV" => [3, "V"],
+  "kW" => [3, "W"],  "kWb" => [3, "Wb"],  "ka" => [3, "a"],
+  "kac" => [3, "ac"],  "katm" => [3, "atm"],  "kbar" => [3, "bar"],
+  "kcal" => [3, "cal"],  "kcd" => [3, "cd"],
   "kconventional_mercury" => [3, "conventional_mercury"],
-  "kd" => [3, "d"],  "kdegC" => [3, "degC"],  "kdegF" => [3, "degF"],
+  "kdegC" => [3, "degC"],  "kdegF" => [3, "degF"],
   "kdeg_C" => [3, "deg_C"],  "kdeg_F" => [3, "deg_F"],
   "kdegreeC" => [3, "degreeC"],  "kdegreeF" => [3, "degreeF"],
   "kdegree_C" => [3, "degree_C"],  "kdegree_E" => [3, "degree_E"],
@@ -1643,7 +1192,8 @@ UALIASES = {
   "kiloangular_minute" => [3, "angular_minute"],
   "kiloangular_second" => [3, "angular_second"],
   "kiloare" => [3, "are"],  "kiloatmosphere" => [3, "atmosphere"],
-  "kilocalorie" => [3, "calorie"],  "kilocelsius" => [3, "celsius"],
+  "kilocalorie" => [3, "calorie"],  "kilocandela" => [3, "candela"],
+  "kilocelsius" => [3, "celsius"],
   "kilocentigrade" => [3, "centigrade"],
   "kilocentury" => [3, "century"],  "kilochain" => [3, "chain"],
   "kilocommon_year" => [3, "common_year"],
@@ -1666,8 +1216,9 @@ UALIASES = {
   "kilomonth" => [3, "month"],  "kilonewton" => [3, "newton"],
   "kiloounce" => [3, "ounce"],  "kiloparsec" => [3, "parsec"],
   "kilopascal" => [3, "pascal"],  "kilopentad" => [3, "pentad"],
-  "kilopoise" => [3, "poise"],  "kilopound" => [3, "pound"],
-  "kiloradian" => [3, "radian"],  "kilosecond" => [3, "second"],
+  "kilopercent" => [3, "percent"],  "kilopoise" => [3, "poise"],
+  "kilopound" => [3, "pound"],  "kiloradian" => [3, "radian"],
+  "kilosecond" => [3, "second"],
   "kilosecond_angle" => [3, "second_angle"],
   "kilosteradian" => [3, "steradian"],  "kilostokes" => [3, "stokes"],
   "kilotesla" => [3, "tesla"],  "kiloton" => [3, "ton"],
@@ -1675,29 +1226,27 @@ UALIASES = {
   "kilovolt" => [3, "volt"],  "kilowatt" => [3, "watt"],
   "kiloweber" => [3, "weber"],  "kiloyard" => [3, "yard"],
   "kiloyd" => [3, "yd"],  "kiloyear" => [3, "year"],
-  "kin" => [3, "in"],  "kkg" => [3, "kg"],  "kkgf" => [3, "kgf"],
-  "kkph" => [3, "kph"],  "klb" => [3, "lb"],  "klm" => [3, "lm"],
-  "klx" => [3, "lx"],  "kly" => [3, "ly"],  "km" => [3, "m"],
-  "kmb" => [3, "mb"],  "kmercury" => [3, "mercury"],
-  "kmgal" => [3, "mgal"],  "kmin" => [3, "min"],  "kmol" => [3, "mol"],
-  "kmon" => [3, "mon"],  "kmph" => [3, "mph"],  "knots" => [0, "knot"],
-  "kohm" => [3, "ohm"],  "koz" => [3, "oz"],  "kpc" => [3, "pc"],
-  "kpercent" => [3, "percent"],  "kpermil" => [3, "permil"],
-  "kpsi" => [3, "psi"],  "krad" => [3, "rad"],  "ks" => [3, "s"],
-  "ksr" => [3, "sr"],  "kt" => [3, "t"],  "kyr" => [3, "yr"],
-  "litres" => [0, "litre"],  "m%" => [-3, "%"],  "mA" => [-3, "A"],
-  "mAu" => [-3, "Au"],  "mBq" => [-3, "Bq"],  "mC" => [-3, "C"],
-  "mF" => [-3, "F"],  "mG" => [-3, "G"],  "mGal" => [-3, "Gal"],
-  "mGy" => [-3, "Gy"],  "mH" => [-3, "H"],  "mHg" => [-3, "Hg"],
-  "mHz" => [-3, "Hz"],  "mJ" => [-3, "J"],  "mK" => [-3, "K"],
-  "mL" => [-3, "L"],  "mN" => [-3, "N"],  "mP" => [-3, "P"],
-  "mPa" => [-3, "Pa"],  "mS" => [-3, "S"],  "mSt" => [-3, "St"],
-  "mSv" => [-3, "Sv"],  "mT" => [-3, "T"],  "mV" => [-3, "V"],
-  "mW" => [-3, "W"],  "mWb" => [-3, "Wb"],  "ma" => [-3, "a"],
-  "mac" => [-3, "ac"],  "matm" => [-3, "atm"],  "mbar" => [-3, "bar"],
-  "mcal" => [-3, "cal"],
+  "kin" => [3, "in"],  "kkgf" => [3, "kgf"],  "kkph" => [3, "kph"],
+  "klb" => [3, "lb"],  "klm" => [3, "lm"],  "klx" => [3, "lx"],
+  "kly" => [3, "ly"],  "km" => [3, "m"],  "kmb" => [3, "mb"],
+  "kmercury" => [3, "mercury"],  "kmgal" => [3, "mgal"],
+  "kmin" => [3, "min"],  "kmol" => [3, "mol"],  "kmon" => [3, "mon"],
+  "kmph" => [3, "mph"],  "knots" => [0, "knot"],  "kohm" => [3, "ohm"],
+  "koz" => [3, "oz"],  "kpc" => [3, "pc"],  "kpsi" => [3, "psi"],
+  "krad" => [3, "rad"],  "ks" => [3, "s"],  "ksr" => [3, "sr"],
+  "kt" => [3, "t"],  "kyr" => [3, "yr"],  "litres" => [0, "litre"],
+  "mA" => [-3, "A"],  "mAu" => [-3, "Au"],  "mBq" => [-3, "Bq"],
+  "mC" => [-3, "C"],  "mF" => [-3, "F"],  "mG" => [-3, "G"],
+  "mGal" => [-3, "Gal"],  "mGy" => [-3, "Gy"],  "mH" => [-3, "H"],
+  "mHg" => [-3, "Hg"],  "mHz" => [-3, "Hz"],  "mJ" => [-3, "J"],
+  "mK" => [-3, "K"],  "mL" => [-3, "L"],  "mN" => [-3, "N"],
+  "mP" => [-3, "P"],  "mPa" => [-3, "Pa"],  "mS" => [-3, "S"],
+  "mSt" => [-3, "St"],  "mSv" => [-3, "Sv"],  "mT" => [-3, "T"],
+  "mV" => [-3, "V"],  "mW" => [-3, "W"],  "mWb" => [-3, "Wb"],
+  "ma" => [-3, "a"],  "mac" => [-3, "ac"],  "matm" => [-3, "atm"],
+  "mbar" => [-3, "bar"],  "mcal" => [-3, "cal"],  "mcd" => [-3, "cd"],
   "mconventional_mercury" => [-3, "conventional_mercury"],
-  "md" => [-3, "d"],  "mdegC" => [-3, "degC"],  "mdegF" => [-3, "degF"],
+  "mdegC" => [-3, "degC"],  "mdegF" => [-3, "degF"],
   "mdeg_C" => [-3, "deg_C"],  "mdeg_F" => [-3, "deg_F"],
   "mdegreeC" => [-3, "degreeC"],  "mdegreeF" => [-3, "degreeF"],
   "mdegree_C" => [-3, "degree_C"],  "mdegree_E" => [-3, "degree_E"],
@@ -1722,7 +1271,8 @@ UALIASES = {
   "megaangular_minute" => [6, "angular_minute"],
   "megaangular_second" => [6, "angular_second"],
   "megaare" => [6, "are"],  "megaatmosphere" => [6, "atmosphere"],
-  "megacalorie" => [6, "calorie"],  "megacelsius" => [6, "celsius"],
+  "megacalorie" => [6, "calorie"],  "megacandela" => [6, "candela"],
+  "megacelsius" => [6, "celsius"],
   "megacentigrade" => [6, "centigrade"],
   "megacentury" => [6, "century"],  "megachain" => [6, "chain"],
   "megacommon_year" => [6, "common_year"],
@@ -1745,8 +1295,9 @@ UALIASES = {
   "megamonth" => [6, "month"],  "meganewton" => [6, "newton"],
   "megaounce" => [6, "ounce"],  "megaparsec" => [6, "parsec"],
   "megapascal" => [6, "pascal"],  "megapentad" => [6, "pentad"],
-  "megapoise" => [6, "poise"],  "megapound" => [6, "pound"],
-  "megaradian" => [6, "radian"],  "megasecond" => [6, "second"],
+  "megapercent" => [6, "percent"],  "megapoise" => [6, "poise"],
+  "megapound" => [6, "pound"],  "megaradian" => [6, "radian"],
+  "megasecond" => [6, "second"],
   "megasecond_angle" => [6, "second_angle"],
   "megasteradian" => [6, "steradian"],  "megastokes" => [6, "stokes"],
   "megatesla" => [6, "tesla"],  "megaton" => [6, "ton"],
@@ -1767,7 +1318,8 @@ UALIASES = {
   "microangular_minute" => [-6, "angular_minute"],
   "microangular_second" => [-6, "angular_second"],
   "microare" => [-6, "are"],  "microatmosphere" => [-6, "atmosphere"],
-  "microcalorie" => [-6, "calorie"],  "microcelsius" => [-6, "celsius"],
+  "microcalorie" => [-6, "calorie"],  "microcandela" => [-6, "candela"],
+  "microcelsius" => [-6, "celsius"],
   "microcentigrade" => [-6, "centigrade"],
   "microcentury" => [-6, "century"],  "microchain" => [-6, "chain"],
   "microcommon_year" => [-6, "common_year"],
@@ -1791,8 +1343,9 @@ UALIASES = {
   "micronewton" => [-6, "newton"],  "microns" => [0, "micron"],
   "microounce" => [-6, "ounce"],  "microparsec" => [-6, "parsec"],
   "micropascal" => [-6, "pascal"],  "micropentad" => [-6, "pentad"],
-  "micropoise" => [-6, "poise"],  "micropound" => [-6, "pound"],
-  "microradian" => [-6, "radian"],  "microsecond" => [-6, "second"],
+  "micropercent" => [-6, "percent"],  "micropoise" => [-6, "poise"],
+  "micropound" => [-6, "pound"],  "microradian" => [-6, "radian"],
+  "microsecond" => [-6, "second"],
   "microsecond_angle" => [-6, "second_angle"],
   "microsteradian" => [-6, "steradian"],
   "microstokes" => [-6, "stokes"],  "microtesla" => [-6, "tesla"],
@@ -1811,7 +1364,7 @@ UALIASES = {
   "milliangular_second" => [-3, "angular_second"],
   "milliare" => [-3, "are"],  "milliatmosphere" => [-3, "atmosphere"],
   "millibars" => [0, "millibar"],  "millicalorie" => [-3, "calorie"],
-  "millicelsius" => [-3, "celsius"],
+  "millicandela" => [-3, "candela"],  "millicelsius" => [-3, "celsius"],
   "millicentigrade" => [-3, "centigrade"],
   "millicentury" => [-3, "century"],  "millichain" => [-3, "chain"],
   "millicommon_year" => [-3, "common_year"],
@@ -1834,9 +1387,9 @@ UALIASES = {
   "millimole" => [-3, "mole"],  "millimonth" => [-3, "month"],
   "millinewton" => [-3, "newton"],  "milliounce" => [-3, "ounce"],
   "milliparsec" => [-3, "parsec"],  "millipascal" => [-3, "pascal"],
-  "millipentad" => [-3, "pentad"],  "millipoise" => [-3, "poise"],
-  "millipound" => [-3, "pound"],  "milliradian" => [-3, "radian"],
-  "millisecond" => [-3, "second"],
+  "millipentad" => [-3, "pentad"],  "millipercent" => [-3, "percent"],
+  "millipoise" => [-3, "poise"],  "millipound" => [-3, "pound"],
+  "milliradian" => [-3, "radian"],  "millisecond" => [-3, "second"],
   "millisecond_angle" => [-3, "second_angle"],
   "millisteradian" => [-3, "steradian"],
   "millistokes" => [-3, "stokes"],  "millitesla" => [-3, "tesla"],
@@ -1846,27 +1399,25 @@ UALIASES = {
   "milliyard" => [-3, "yard"],  "milliyd" => [-3, "yd"],
   "milliyear" => [-3, "year"],  "min" => [-3, "in"],
   "minutes" => [0, "minute"],  "minutes_angle" => [0, "minute_angle"],
-  "mkg" => [-3, "kg"],  "mkgf" => [-3, "kgf"],  "mkph" => [-3, "kph"],
-  "mlb" => [-3, "lb"],  "mlm" => [-3, "lm"],  "mlx" => [-3, "lx"],
-  "mly" => [-3, "ly"],  "mm" => [-3, "m"],  "mmb" => [-3, "mb"],
+  "mkgf" => [-3, "kgf"],  "mkph" => [-3, "kph"],  "mlb" => [-3, "lb"],
+  "mlm" => [-3, "lm"],  "mlx" => [-3, "lx"],  "mly" => [-3, "ly"],
+  "mm" => [-3, "m"],  "mmb" => [-3, "mb"],
   "mmercury" => [-3, "mercury"],  "mmgal" => [-3, "mgal"],
   "mmin" => [-3, "min"],  "mmol" => [-3, "mol"],  "mmon" => [-3, "mon"],
   "mmph" => [-3, "mph"],  "mohm" => [-3, "ohm"],
   "moles" => [0, "mole"],  "months" => [0, "month"],
-  "moz" => [-3, "oz"],  "mpc" => [-3, "pc"],
-  "mpercent" => [-3, "percent"],  "mpermil" => [-3, "permil"],
-  "mpsi" => [-3, "psi"],  "mrad" => [-3, "rad"],  "ms" => [-3, "s"],
-  "msr" => [-3, "sr"],  "mt" => [-3, "t"],  "myr" => [-3, "yr"],
-  "n%" => [-9, "%"],  "nA" => [-9, "A"],  "nAu" => [-9, "Au"],
-  "nBq" => [-9, "Bq"],  "nC" => [-9, "C"],  "nF" => [-9, "F"],
-  "nG" => [-9, "G"],  "nGal" => [-9, "Gal"],  "nGy" => [-9, "Gy"],
-  "nH" => [-9, "H"],  "nHg" => [-9, "Hg"],  "nHz" => [-9, "Hz"],
-  "nJ" => [-9, "J"],  "nK" => [-9, "K"],  "nL" => [-9, "L"],
-  "nN" => [-9, "N"],  "nP" => [-9, "P"],  "nPa" => [-9, "Pa"],
-  "nS" => [-9, "S"],  "nSt" => [-9, "St"],  "nSv" => [-9, "Sv"],
-  "nT" => [-9, "T"],  "nV" => [-9, "V"],  "nW" => [-9, "W"],
-  "nWb" => [-9, "Wb"],  "na" => [-9, "a"],  "nac" => [-9, "ac"],
-  "nanoCelsius" => [-9, "Celsius"],
+  "moz" => [-3, "oz"],  "mpc" => [-3, "pc"],  "mpsi" => [-3, "psi"],
+  "mrad" => [-3, "rad"],  "ms" => [-3, "s"],  "msr" => [-3, "sr"],
+  "mt" => [-3, "t"],  "myr" => [-3, "yr"],  "nA" => [-9, "A"],
+  "nAu" => [-9, "Au"],  "nBq" => [-9, "Bq"],  "nC" => [-9, "C"],
+  "nF" => [-9, "F"],  "nG" => [-9, "G"],  "nGal" => [-9, "Gal"],
+  "nGy" => [-9, "Gy"],  "nH" => [-9, "H"],  "nHg" => [-9, "Hg"],
+  "nHz" => [-9, "Hz"],  "nJ" => [-9, "J"],  "nK" => [-9, "K"],
+  "nL" => [-9, "L"],  "nN" => [-9, "N"],  "nP" => [-9, "P"],
+  "nPa" => [-9, "Pa"],  "nS" => [-9, "S"],  "nSt" => [-9, "St"],
+  "nSv" => [-9, "Sv"],  "nT" => [-9, "T"],  "nV" => [-9, "V"],
+  "nW" => [-9, "W"],  "nWb" => [-9, "Wb"],  "na" => [-9, "a"],
+  "nac" => [-9, "ac"],  "nanoCelsius" => [-9, "Celsius"],
   "nanoFahrenheit" => [-9, "Fahrenheit"],
   "nanoJulian_year" => [-9, "Julian_year"],
   "nanoPascal" => [-9, "Pascal"],  "nanoacre" => [-9, "acre"],
@@ -1875,7 +1426,8 @@ UALIASES = {
   "nanoangular_minute" => [-9, "angular_minute"],
   "nanoangular_second" => [-9, "angular_second"],
   "nanoare" => [-9, "are"],  "nanoatmosphere" => [-9, "atmosphere"],
-  "nanocalorie" => [-9, "calorie"],  "nanocelsius" => [-9, "celsius"],
+  "nanocalorie" => [-9, "calorie"],  "nanocandela" => [-9, "candela"],
+  "nanocelsius" => [-9, "celsius"],
   "nanocentigrade" => [-9, "centigrade"],
   "nanocentury" => [-9, "century"],  "nanochain" => [-9, "chain"],
   "nanocommon_year" => [-9, "common_year"],
@@ -1898,9 +1450,9 @@ UALIASES = {
   "nanomole" => [-9, "mole"],  "nanomonth" => [-9, "month"],
   "nanonewton" => [-9, "newton"],  "nanoounce" => [-9, "ounce"],
   "nanoparsec" => [-9, "parsec"],  "nanopascal" => [-9, "pascal"],
-  "nanopentad" => [-9, "pentad"],  "nanopoise" => [-9, "poise"],
-  "nanopound" => [-9, "pound"],  "nanoradian" => [-9, "radian"],
-  "nanosecond" => [-9, "second"],
+  "nanopentad" => [-9, "pentad"],  "nanopercent" => [-9, "percent"],
+  "nanopoise" => [-9, "poise"],  "nanopound" => [-9, "pound"],
+  "nanoradian" => [-9, "radian"],  "nanosecond" => [-9, "second"],
   "nanosecond_angle" => [-9, "second_angle"],
   "nanosteradian" => [-9, "steradian"],  "nanostokes" => [-9, "stokes"],
   "nanotesla" => [-9, "tesla"],  "nanoton" => [-9, "ton"],
@@ -1909,8 +1461,9 @@ UALIASES = {
   "nanoweber" => [-9, "weber"],  "nanoyard" => [-9, "yard"],
   "nanoyd" => [-9, "yd"],  "nanoyear" => [-9, "year"],
   "natm" => [-9, "atm"],  "nbar" => [-9, "bar"],  "ncal" => [-9, "cal"],
+  "ncd" => [-9, "cd"],
   "nconventional_mercury" => [-9, "conventional_mercury"],
-  "nd" => [-9, "d"],  "ndegC" => [-9, "degC"],  "ndegF" => [-9, "degF"],
+  "ndegC" => [-9, "degC"],  "ndegF" => [-9, "degF"],
   "ndeg_C" => [-9, "deg_C"],  "ndeg_F" => [-9, "deg_F"],
   "ndegreeC" => [-9, "degreeC"],  "ndegreeF" => [-9, "degreeF"],
   "ndegree_C" => [-9, "degree_C"],  "ndegree_E" => [-9, "degree_E"],
@@ -1930,37 +1483,35 @@ UALIASES = {
   "nforce" => [-9, "force"],  "ng" => [-9, "g"],
   "ngravity" => [-9, "gravity"],  "nh" => [-9, "h"],
   "nhg" => [-9, "hg"],  "nhr" => [-9, "hr"],  "nin" => [-9, "in"],
-  "nkg" => [-9, "kg"],  "nkgf" => [-9, "kgf"],  "nkph" => [-9, "kph"],
-  "nlb" => [-9, "lb"],  "nlm" => [-9, "lm"],  "nlx" => [-9, "lx"],
-  "nly" => [-9, "ly"],  "nm" => [-9, "m"],  "nmb" => [-9, "mb"],
+  "nkgf" => [-9, "kgf"],  "nkph" => [-9, "kph"],  "nlb" => [-9, "lb"],
+  "nlm" => [-9, "lm"],  "nlx" => [-9, "lx"],  "nly" => [-9, "ly"],
+  "nm" => [-9, "m"],  "nmb" => [-9, "mb"],
   "nmercury" => [-9, "mercury"],  "nmgal" => [-9, "mgal"],
   "nmin" => [-9, "min"],  "nmol" => [-9, "mol"],  "nmon" => [-9, "mon"],
   "nmph" => [-9, "mph"],  "nohm" => [-9, "ohm"],  "noz" => [-9, "oz"],
-  "npc" => [-9, "pc"],  "npercent" => [-9, "percent"],
-  "npermil" => [-9, "permil"],  "npsi" => [-9, "psi"],
-  "nrad" => [-9, "rad"],  "ns" => [-9, "s"],  "nsr" => [-9, "sr"],
-  "nt" => [-9, "t"],  "nyr" => [-9, "yr"],  "ounces" => [0, "ounce"],
-  "p%" => [-12, "%"],  "pA" => [-12, "A"],  "pAu" => [-12, "Au"],
-  "pBq" => [-12, "Bq"],  "pC" => [-12, "C"],  "pF" => [-12, "F"],
-  "pG" => [-12, "G"],  "pGal" => [-12, "Gal"],  "pGy" => [-12, "Gy"],
-  "pH" => [-12, "H"],  "pHg" => [-12, "Hg"],  "pHz" => [-12, "Hz"],
-  "pJ" => [-12, "J"],  "pK" => [-12, "K"],  "pL" => [-12, "L"],
-  "pN" => [-12, "N"],  "pP" => [-12, "P"],  "pPa" => [-12, "Pa"],
-  "pS" => [-12, "S"],  "pSt" => [-12, "St"],  "pSv" => [-12, "Sv"],
-  "pT" => [-12, "T"],  "pV" => [-12, "V"],  "pW" => [-12, "W"],
-  "pWb" => [-12, "Wb"],  "pa" => [-12, "a"],  "pac" => [-12, "ac"],
-  "parsecs" => [0, "parsec"],  "pascals" => [0, "pascal"],
-  "patm" => [-12, "atm"],  "pbar" => [-12, "bar"],
-  "pcal" => [-12, "cal"],
+  "npc" => [-9, "pc"],  "npsi" => [-9, "psi"],  "nrad" => [-9, "rad"],
+  "ns" => [-9, "s"],  "nsr" => [-9, "sr"],  "nt" => [-9, "t"],
+  "nyr" => [-9, "yr"],  "ounces" => [0, "ounce"],  "pA" => [-12, "A"],
+  "pAu" => [-12, "Au"],  "pBq" => [-12, "Bq"],  "pC" => [-12, "C"],
+  "pF" => [-12, "F"],  "pG" => [-12, "G"],  "pGal" => [-12, "Gal"],
+  "pGy" => [-12, "Gy"],  "pH" => [-12, "H"],  "pHg" => [-12, "Hg"],
+  "pHz" => [-12, "Hz"],  "pJ" => [-12, "J"],  "pK" => [-12, "K"],
+  "pL" => [-12, "L"],  "pN" => [-12, "N"],  "pP" => [-12, "P"],
+  "pPa" => [-12, "Pa"],  "pS" => [-12, "S"],  "pSt" => [-12, "St"],
+  "pSv" => [-12, "Sv"],  "pT" => [-12, "T"],  "pV" => [-12, "V"],
+  "pW" => [-12, "W"],  "pWb" => [-12, "Wb"],  "pa" => [-12, "a"],
+  "pac" => [-12, "ac"],  "parsecs" => [0, "parsec"],
+  "pascals" => [0, "pascal"],  "patm" => [-12, "atm"],
+  "pbar" => [-12, "bar"],  "pcal" => [-12, "cal"],
+  "pcd" => [-12, "cd"],
   "pconventional_mercury" => [-12, "conventional_mercury"],
-  "pd" => [-12, "d"],  "pdegC" => [-12, "degC"],
-  "pdegF" => [-12, "degF"],  "pdeg_C" => [-12, "deg_C"],
-  "pdeg_F" => [-12, "deg_F"],  "pdegreeC" => [-12, "degreeC"],
-  "pdegreeF" => [-12, "degreeF"],  "pdegree_C" => [-12, "degree_C"],
-  "pdegree_E" => [-12, "degree_E"],  "pdegree_F" => [-12, "degree_F"],
-  "pdegree_N" => [-12, "degree_N"],  "pdegree_R" => [-12, "degree_R"],
-  "pdegree_S" => [-12, "degree_S"],  "pdegree_W" => [-12, "degree_W"],
-  "pdegree_c" => [-12, "degree_c"],
+  "pdegC" => [-12, "degC"],  "pdegF" => [-12, "degF"],
+  "pdeg_C" => [-12, "deg_C"],  "pdeg_F" => [-12, "deg_F"],
+  "pdegreeC" => [-12, "degreeC"],  "pdegreeF" => [-12, "degreeF"],
+  "pdegree_C" => [-12, "degree_C"],  "pdegree_E" => [-12, "degree_E"],
+  "pdegree_F" => [-12, "degree_F"],  "pdegree_N" => [-12, "degree_N"],
+  "pdegree_R" => [-12, "degree_R"],  "pdegree_S" => [-12, "degree_S"],
+  "pdegree_W" => [-12, "degree_W"],  "pdegree_c" => [-12, "degree_c"],
   "pdegree_east" => [-12, "degree_east"],
   "pdegree_f" => [-12, "degree_f"],
   "pdegree_north" => [-12, "degree_north"],
@@ -1970,8 +1521,8 @@ UALIASES = {
   "pdegrees_north" => [-12, "degrees_north"],
   "pdegrees_south" => [-12, "degrees_south"],
   "pdegrees_west" => [-12, "degrees_west"],  "pdyn" => [-12, "dyn"],
-  "pentads" => [0, "pentad"],  "perg" => [-12, "erg"],
-  "petaCelsius" => [15, "Celsius"],
+  "pentads" => [0, "pentad"],  "percents" => [0, "percent"],
+  "perg" => [-12, "erg"],  "petaCelsius" => [15, "Celsius"],
   "petaFahrenheit" => [15, "Fahrenheit"],
   "petaJulian_year" => [15, "Julian_year"],
   "petaPascal" => [15, "Pascal"],  "petaacre" => [15, "acre"],
@@ -1980,7 +1531,8 @@ UALIASES = {
   "petaangular_minute" => [15, "angular_minute"],
   "petaangular_second" => [15, "angular_second"],
   "petaare" => [15, "are"],  "petaatmosphere" => [15, "atmosphere"],
-  "petacalorie" => [15, "calorie"],  "petacelsius" => [15, "celsius"],
+  "petacalorie" => [15, "calorie"],  "petacandela" => [15, "candela"],
+  "petacelsius" => [15, "celsius"],
   "petacentigrade" => [15, "centigrade"],
   "petacentury" => [15, "century"],  "petachain" => [15, "chain"],
   "petacommon_year" => [15, "common_year"],
@@ -2003,9 +1555,9 @@ UALIASES = {
   "petamole" => [15, "mole"],  "petamonth" => [15, "month"],
   "petanewton" => [15, "newton"],  "petaounce" => [15, "ounce"],
   "petaparsec" => [15, "parsec"],  "petapascal" => [15, "pascal"],
-  "petapentad" => [15, "pentad"],  "petapoise" => [15, "poise"],
-  "petapound" => [15, "pound"],  "petaradian" => [15, "radian"],
-  "petasecond" => [15, "second"],
+  "petapentad" => [15, "pentad"],  "petapercent" => [15, "percent"],
+  "petapoise" => [15, "poise"],  "petapound" => [15, "pound"],
+  "petaradian" => [15, "radian"],  "petasecond" => [15, "second"],
   "petasecond_angle" => [15, "second_angle"],
   "petasteradian" => [15, "steradian"],  "petastokes" => [15, "stokes"],
   "petatesla" => [15, "tesla"],  "petaton" => [15, "ton"],
@@ -2025,7 +1577,8 @@ UALIASES = {
   "picoangular_minute" => [-12, "angular_minute"],
   "picoangular_second" => [-12, "angular_second"],
   "picoare" => [-12, "are"],  "picoatmosphere" => [-12, "atmosphere"],
-  "picocalorie" => [-12, "calorie"],  "picocelsius" => [-12, "celsius"],
+  "picocalorie" => [-12, "calorie"],  "picocandela" => [-12, "candela"],
+  "picocelsius" => [-12, "celsius"],
   "picocentigrade" => [-12, "centigrade"],
   "picocentury" => [-12, "century"],  "picochain" => [-12, "chain"],
   "picocommon_year" => [-12, "common_year"],
@@ -2048,9 +1601,9 @@ UALIASES = {
   "picomole" => [-12, "mole"],  "picomonth" => [-12, "month"],
   "piconewton" => [-12, "newton"],  "picoounce" => [-12, "ounce"],
   "picoparsec" => [-12, "parsec"],  "picopascal" => [-12, "pascal"],
-  "picopentad" => [-12, "pentad"],  "picopoise" => [-12, "poise"],
-  "picopound" => [-12, "pound"],  "picoradian" => [-12, "radian"],
-  "picosecond" => [-12, "second"],
+  "picopentad" => [-12, "pentad"],  "picopercent" => [-12, "percent"],
+  "picopoise" => [-12, "poise"],  "picopound" => [-12, "pound"],
+  "picoradian" => [-12, "radian"],  "picosecond" => [-12, "second"],
   "picosecond_angle" => [-12, "second_angle"],
   "picosteradian" => [-12, "steradian"],
   "picostokes" => [-12, "stokes"],  "picotesla" => [-12, "tesla"],
@@ -2059,18 +1612,17 @@ UALIASES = {
   "picowatt" => [-12, "watt"],  "picoweber" => [-12, "weber"],
   "picoyard" => [-12, "yard"],  "picoyd" => [-12, "yd"],
   "picoyear" => [-12, "year"],  "pin" => [-12, "in"],
-  "pkg" => [-12, "kg"],  "pkgf" => [-12, "kgf"],
-  "pkph" => [-12, "kph"],  "plb" => [-12, "lb"],  "plm" => [-12, "lm"],
-  "plx" => [-12, "lx"],  "ply" => [-12, "ly"],  "pm" => [-12, "m"],
-  "pmb" => [-12, "mb"],  "pmercury" => [-12, "mercury"],
-  "pmgal" => [-12, "mgal"],  "pmin" => [-12, "min"],
-  "pmol" => [-12, "mol"],  "pmon" => [-12, "mon"],
-  "pmph" => [-12, "mph"],  "pohm" => [-12, "ohm"],
-  "poises" => [0, "poise"],  "pounds" => [0, "pound"],
-  "poz" => [-12, "oz"],  "ppc" => [-12, "pc"],
-  "ppercent" => [-12, "percent"],  "ppermil" => [-12, "permil"],
-  "ppsi" => [-12, "psi"],  "prad" => [-12, "rad"],  "ps" => [-12, "s"],
-  "psr" => [-12, "sr"],  "pt" => [-12, "t"],  "pyr" => [-12, "yr"],
+  "pkgf" => [-12, "kgf"],  "pkph" => [-12, "kph"],
+  "plb" => [-12, "lb"],  "plm" => [-12, "lm"],  "plx" => [-12, "lx"],
+  "ply" => [-12, "ly"],  "pm" => [-12, "m"],  "pmb" => [-12, "mb"],
+  "pmercury" => [-12, "mercury"],  "pmgal" => [-12, "mgal"],
+  "pmin" => [-12, "min"],  "pmol" => [-12, "mol"],
+  "pmon" => [-12, "mon"],  "pmph" => [-12, "mph"],
+  "pohm" => [-12, "ohm"],  "poises" => [0, "poise"],
+  "pounds" => [0, "pound"],  "poz" => [-12, "oz"],
+  "ppc" => [-12, "pc"],  "ppsi" => [-12, "psi"],
+  "prad" => [-12, "rad"],  "ps" => [-12, "s"],  "psr" => [-12, "sr"],
+  "pt" => [-12, "t"],  "pyr" => [-12, "yr"],
   "radians" => [0, "radian"],  "seconds" => [0, "second"],
   "seconds_angle" => [0, "second_angle"],
   "steradians" => [0, "steradian"],  "stokeses" => [0, "stokes"],
@@ -2083,7 +1635,8 @@ UALIASES = {
   "telaangular_minute" => [12, "angular_minute"],
   "telaangular_second" => [12, "angular_second"],
   "telaare" => [12, "are"],  "telaatmosphere" => [12, "atmosphere"],
-  "telacalorie" => [12, "calorie"],  "telacelsius" => [12, "celsius"],
+  "telacalorie" => [12, "calorie"],  "telacandela" => [12, "candela"],
+  "telacelsius" => [12, "celsius"],
   "telacentigrade" => [12, "centigrade"],
   "telacentury" => [12, "century"],  "telachain" => [12, "chain"],
   "telacommon_year" => [12, "common_year"],
@@ -2106,9 +1659,9 @@ UALIASES = {
   "telamole" => [12, "mole"],  "telamonth" => [12, "month"],
   "telanewton" => [12, "newton"],  "telaounce" => [12, "ounce"],
   "telaparsec" => [12, "parsec"],  "telapascal" => [12, "pascal"],
-  "telapentad" => [12, "pentad"],  "telapoise" => [12, "poise"],
-  "telapound" => [12, "pound"],  "telaradian" => [12, "radian"],
-  "telasecond" => [12, "second"],
+  "telapentad" => [12, "pentad"],  "telapercent" => [12, "percent"],
+  "telapoise" => [12, "poise"],  "telapound" => [12, "pound"],
+  "telaradian" => [12, "radian"],  "telasecond" => [12, "second"],
   "telasecond_angle" => [12, "second_angle"],
   "telasteradian" => [12, "steradian"],  "telastokes" => [12, "stokes"],
   "telatesla" => [12, "tesla"],  "telaton" => [12, "ton"],
@@ -2117,19 +1670,19 @@ UALIASES = {
   "telaweber" => [12, "weber"],  "telayard" => [12, "yard"],
   "telayd" => [12, "yd"],  "telayear" => [12, "year"],
   "teslas" => [0, "tesla"],  "tonnes" => [0, "tonne"],
-  "tons" => [0, "ton"],  "torrs" => [0, "torr"],  "u%" => [-6, "%"],
-  "uA" => [-6, "A"],  "uAu" => [-6, "Au"],  "uBq" => [-6, "Bq"],
-  "uC" => [-6, "C"],  "uF" => [-6, "F"],  "uG" => [-6, "G"],
-  "uGal" => [-6, "Gal"],  "uGy" => [-6, "Gy"],  "uH" => [-6, "H"],
-  "uHg" => [-6, "Hg"],  "uHz" => [-6, "Hz"],  "uJ" => [-6, "J"],
-  "uK" => [-6, "K"],  "uL" => [-6, "L"],  "uN" => [-6, "N"],
-  "uP" => [-6, "P"],  "uPa" => [-6, "Pa"],  "uS" => [-6, "S"],
-  "uSt" => [-6, "St"],  "uSv" => [-6, "Sv"],  "uT" => [-6, "T"],
-  "uV" => [-6, "V"],  "uW" => [-6, "W"],  "uWb" => [-6, "Wb"],
-  "ua" => [-6, "a"],  "uac" => [-6, "ac"],  "uatm" => [-6, "atm"],
-  "ubar" => [-6, "bar"],  "ucal" => [-6, "cal"],
+  "tons" => [0, "ton"],  "torrs" => [0, "torr"],  "uA" => [-6, "A"],
+  "uAu" => [-6, "Au"],  "uBq" => [-6, "Bq"],  "uC" => [-6, "C"],
+  "uF" => [-6, "F"],  "uG" => [-6, "G"],  "uGal" => [-6, "Gal"],
+  "uGy" => [-6, "Gy"],  "uH" => [-6, "H"],  "uHg" => [-6, "Hg"],
+  "uHz" => [-6, "Hz"],  "uJ" => [-6, "J"],  "uK" => [-6, "K"],
+  "uL" => [-6, "L"],  "uN" => [-6, "N"],  "uP" => [-6, "P"],
+  "uPa" => [-6, "Pa"],  "uS" => [-6, "S"],  "uSt" => [-6, "St"],
+  "uSv" => [-6, "Sv"],  "uT" => [-6, "T"],  "uV" => [-6, "V"],
+  "uW" => [-6, "W"],  "uWb" => [-6, "Wb"],  "ua" => [-6, "a"],
+  "uac" => [-6, "ac"],  "uatm" => [-6, "atm"],  "ubar" => [-6, "bar"],
+  "ucal" => [-6, "cal"],  "ucd" => [-6, "cd"],
   "uconventional_mercury" => [-6, "conventional_mercury"],
-  "ud" => [-6, "d"],  "udegC" => [-6, "degC"],  "udegF" => [-6, "degF"],
+  "udegC" => [-6, "degC"],  "udegF" => [-6, "degF"],
   "udeg_C" => [-6, "deg_C"],  "udeg_F" => [-6, "deg_F"],
   "udegreeC" => [-6, "degreeC"],  "udegreeF" => [-6, "degreeF"],
   "udegree_C" => [-6, "degree_C"],  "udegree_E" => [-6, "degree_E"],
@@ -2148,18 +1701,17 @@ UALIASES = {
   "uerg" => [-6, "erg"],  "uforce" => [-6, "force"],  "ug" => [-6, "g"],
   "ugravity" => [-6, "gravity"],  "uh" => [-6, "h"],
   "uhg" => [-6, "hg"],  "uhr" => [-6, "hr"],  "uin" => [-6, "in"],
-  "ukg" => [-6, "kg"],  "ukgf" => [-6, "kgf"],  "ukph" => [-6, "kph"],
-  "ulb" => [-6, "lb"],  "ulm" => [-6, "lm"],  "ulx" => [-6, "lx"],
-  "uly" => [-6, "ly"],  "um" => [-6, "m"],  "umb" => [-6, "mb"],
+  "ukgf" => [-6, "kgf"],  "ukph" => [-6, "kph"],  "ulb" => [-6, "lb"],
+  "ulm" => [-6, "lm"],  "ulx" => [-6, "lx"],  "uly" => [-6, "ly"],
+  "um" => [-6, "m"],  "umb" => [-6, "mb"],
   "umercury" => [-6, "mercury"],  "umgal" => [-6, "mgal"],
   "umin" => [-6, "min"],  "umol" => [-6, "mol"],  "umon" => [-6, "mon"],
   "umph" => [-6, "mph"],  "uohm" => [-6, "ohm"],  "uoz" => [-6, "oz"],
-  "upc" => [-6, "pc"],  "upercent" => [-6, "percent"],
-  "upermil" => [-6, "permil"],  "upsi" => [-6, "psi"],
-  "urad" => [-6, "rad"],  "us" => [-6, "s"],  "usr" => [-6, "sr"],
-  "ut" => [-6, "t"],  "uyr" => [-6, "yr"],  "volts" => [0, "volt"],
-  "watts" => [0, "watt"],  "webers" => [0, "weber"],
-  "yards" => [0, "yard"],  "yds" => [0, "yd"],  "years" => [0, "year"],
+  "upc" => [-6, "pc"],  "upsi" => [-6, "psi"],  "urad" => [-6, "rad"],
+  "us" => [-6, "s"],  "usr" => [-6, "sr"],  "ut" => [-6, "t"],
+  "uyr" => [-6, "yr"],  "volts" => [0, "volt"],  "watts" => [0, "watt"],
+  "webers" => [0, "weber"],  "yards" => [0, "yard"],
+  "yds" => [0, "yd"],  "years" => [0, "year"],
 }
 UPLURALS = {
   "Celsiuses" => "Celsius",  "Fahrenheits" => "Fahrenheit",
@@ -2169,22 +1721,23 @@ UPLURALS = {
   "angulars_minute" => "angular_minute",
   "angulars_second" => "angular_second",  "ares" => "are",
   "atmospheres" => "atmosphere",  "calories" => "calorie",
-  "celsiuses" => "celsius",  "centigrades" => "centigrade",
-  "centuries" => "century",  "chains" => "chain",
-  "commons_year" => "common_year",  "coulombs" => "coulomb",
-  "days" => "day",  "degKs" => "degK",  "degreeKs" => "degreeK",
-  "degrees" => "degree",  "degs_K" => "deg_K",  "dynes" => "dyne",
-  "ergs" => "erg",  "fahrenheits" => "fahrenheit",  "farads" => "farad",
-  "fermis" => "fermi",  "gals" => "gal",  "gausses" => "gauss",
-  "grams" => "gram",  "hectares" => "hectare",  "hertzes" => "hertz",
-  "hours" => "hour",  "inchs" => "inch",  "joules" => "joule",
-  "kelvins" => "kelvin",  "kilograms" => "kilogram",  "knots" => "knot",
-  "litres" => "litre",  "meters" => "meter",  "metres" => "metre",
-  "microns" => "micron",  "miles" => "mile",  "millibars" => "millibar",
-  "minutes" => "minute",  "minutes_angle" => "minute_angle",
-  "moles" => "mole",  "months" => "month",  "newtons" => "newton",
-  "ounces" => "ounce",  "parsecs" => "parsec",  "pascals" => "pascal",
-  "pentads" => "pentad",  "poises" => "poise",  "pounds" => "pound",
+  "candelas" => "candela",  "celsiuses" => "celsius",
+  "centigrades" => "centigrade",  "centuries" => "century",
+  "chains" => "chain",  "commons_year" => "common_year",
+  "coulombs" => "coulomb",  "days" => "day",  "degKs" => "degK",
+  "degreeKs" => "degreeK",  "degrees" => "degree",  "degs_K" => "deg_K",
+  "dynes" => "dyne",  "ergs" => "erg",  "fahrenheits" => "fahrenheit",
+  "farads" => "farad",  "fermis" => "fermi",  "gals" => "gal",
+  "gausses" => "gauss",  "grams" => "gram",  "hectares" => "hectare",
+  "hertzes" => "hertz",  "hours" => "hour",  "inchs" => "inch",
+  "joules" => "joule",  "kelvins" => "kelvin",
+  "kilograms" => "kilogram",  "knots" => "knot",  "litres" => "litre",
+  "meters" => "meter",  "metres" => "metre",  "microns" => "micron",
+  "miles" => "mile",  "millibars" => "millibar",  "minutes" => "minute",
+  "minutes_angle" => "minute_angle",  "moles" => "mole",
+  "months" => "month",  "newtons" => "newton",  "ounces" => "ounce",
+  "parsecs" => "parsec",  "pascals" => "pascal",  "pentads" => "pentad",
+  "percents" => "percent",  "poises" => "poise",  "pounds" => "pound",
   "radians" => "radian",  "seconds" => "second",
   "seconds_angle" => "second_angle",  "steradians" => "steradian",
   "stokeses" => "stokes",  "teslas" => "tesla",  "tonnes" => "tonne",
@@ -2803,7 +2356,7 @@ def next_token
     end
 
     if :TIME_SEEN === @lexstat \
-    and @copy.sub!(%r{^UTC[ \t]*}, '') then
+    and @copy.sub!(%r{^(UTC|Z)[ \t]*}, '') then
 	@lexstat = nil
 	return [:ZONE, 0]
     end
@@ -3127,257 +2680,299 @@ def self::pow_f(a, b)
 	a ** b
     end
 end
-
-##### racc 1.4.5 generates ###
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 0, 17, :_reduce_none,
- 1, 17, :_reduce_2,
- 1, 17, :_reduce_3,
- 1, 18, :_reduce_none,
- 3, 18, :_reduce_5,
- 3, 18, :_reduce_6,
- 1, 19, :_reduce_none,
- 1, 19, :_reduce_none,
- 2, 19, :_reduce_9,
- 3, 19, :_reduce_10,
- 3, 19, :_reduce_11,
- 3, 19, :_reduce_12,
- 3, 19, :_reduce_13,
- 1, 22, :_reduce_14,
- 2, 22, :_reduce_15,
- 3, 22, :_reduce_16,
- 3, 22, :_reduce_17,
- 1, 20, :_reduce_none,
- 3, 20, :_reduce_19,
- 1, 23, :_reduce_20,
- 1, 23, :_reduce_21,
- 1, 21, :_reduce_none,
- 3, 21, :_reduce_23,
- 1, 24, :_reduce_24,
- 2, 24, :_reduce_25,
- 3, 24, :_reduce_26 ]
-
-racc_reduce_n = 27
-
-racc_shift_n = 39
+...end units.racc/module_eval...
+##### State transition tables begin ###
 
 racc_action_table = [
-     3,     4,    34,     4,    14,    22,    23,    36,     9,    10,
-     9,     4,    24,     5,     4,    26,    37,     4,     9,    10,
-     4,     9,    38,     5,     9,    10,    20,     9,     4,     5,
-   nil,     4,    20,   nil,   nil,     9,   nil,    24,     9,    10,
-    26,   nil,    16,     5,    17,    18,   nil,     4,    10,     4,
-   nil,     4,     5,    12,     9,    12,     9,    12,     9,     4,
-   nil,   nil,   nil,   nil,   nil,    12,     9 ]
+     3,     9,    35,     9,    32,     9,    19,    11,    10,     7,
+    10,     9,    10,     8,    25,    31,    36,    23,    10,     7,
+     9,    37,     9,     8,     9,    38,   nil,    10,     7,    10,
+     7,    10,     8,    25,     8,     9,    23,   nil,    12,     9,
+    14,    15,    10,     9,     7,    17,    10,    31,     8,    17,
+    10,     9,   nil,     9,   nil,   nil,   nil,    17,    10,    17,
+    10 ]
 
 racc_action_check = [
-     0,     0,    24,    26,     6,    13,    14,    33,     0,     0,
-    26,     5,    26,     0,    20,    26,    34,    18,     5,     5,
-    12,    20,    35,     5,    18,    18,    20,    12,    16,    18,
-   nil,    17,    12,   nil,   nil,    16,   nil,    16,    17,    17,
-    16,   nil,     8,    17,     8,     8,   nil,    29,     8,    31,
-   nil,    15,     8,    29,    29,    31,    31,    15,    15,     1,
-   nil,   nil,   nil,   nil,   nil,     1,     1 ]
+     0,     0,    25,    31,    18,    23,    11,     1,     0,     0,
+    31,    14,    23,     0,    23,    31,    33,    23,    14,    14,
+     8,    34,    15,    14,    12,    35,   nil,     8,     8,    15,
+    15,    12,     8,    12,    15,    17,    12,   nil,     4,     5,
+     4,     4,    17,    28,     4,     5,     5,    17,     4,    28,
+    28,    13,   nil,    26,   nil,   nil,   nil,    13,    13,    26,
+    26 ]
 
 racc_action_pointer = [
-    -1,    57,   nil,   nil,   nil,     9,     4,   nil,    38,   nil,
-   nil,   nil,    18,   -10,     6,    49,    26,    29,    15,   nil,
-    12,   nil,   nil,   nil,   -10,   nil,     1,   nil,   nil,    45,
-   nil,    47,   nil,    -8,     3,     7,   nil,   nil,   nil ]
+    -1,     7,   nil,   nil,    34,    37,   nil,   nil,    18,   nil,
+   nil,     6,    22,    49,     9,    20,   nil,    33,   -11,   nil,
+   nil,   nil,   nil,     3,   nil,   -10,    51,   nil,    41,   nil,
+   nil,     1,   nil,     1,     6,    12,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -1,    -7,    -8,    -3,   -20,   -27,   -27,    -2,    -4,   -21,
-   -14,   -15,   -27,   -27,   -27,    -9,   -27,   -27,   -27,   -18,
-   -27,   -16,   -17,    39,   -24,   -22,   -27,    -5,    -6,   -10,
-   -12,   -11,   -13,   -27,   -25,   -27,   -19,   -26,   -23 ]
+    -1,   -27,    -2,    -3,    -4,    -7,    -8,   -14,   -27,   -20,
+   -21,   -27,   -27,    -9,   -27,   -27,   -15,   -27,   -27,    39,
+    -5,    -6,   -18,   -27,   -22,   -24,   -10,   -12,   -11,   -13,
+   -16,   -27,   -17,   -27,   -27,   -25,   -19,   -23,   -26 ]
 
 racc_goto_table = [
-     2,    15,     7,    28,    21,     2,     6,    13,    27,   nil,
-    29,    31,    19,    35,   nil,   nil,    19,    30,    32,   nil,
-    19,   nil,   nil,   nil,   nil,   nil,    19 ]
+     6,    20,    21,     2,     1,   nil,    30,   nil,     6,    13,
+   nil,    18,    22,    34,    27,    29,   nil,    22,   nil,    26,
+    28,   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    22 ]
 
 racc_goto_check = [
-     7,     6,     2,     5,     4,     7,     1,     2,     4,   nil,
-     6,     6,     7,     5,   nil,   nil,     7,     7,     7,   nil,
-     7,   nil,   nil,   nil,   nil,   nil,     7 ]
+     7,     4,     5,     2,     1,   nil,     4,   nil,     7,     6,
+   nil,     2,     7,     5,     7,     7,   nil,     7,   nil,     6,
+     6,   nil,   nil,     7,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     7 ]
 
 racc_goto_pointer = [
-   nil,     6,     2,   nil,    -8,   -13,    -7,     0,   nil ]
+   nil,     4,     3,   nil,   -11,   -10,     5,     0,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     8,    33,   nil,     1,    11,    25 ]
+   nil,   nil,   nil,     4,    33,   nil,     5,    16,    24 ]
 
-racc_token_table = {
- false => 0,
- Object.new => 1,
- :INT => 2,
- :ERR => 3,
- :SHIFT => 4,
- :SPACE => 5,
- :MULTIPLY => 6,
- :DIVIDE => 7,
- :EXPONENT => 8,
- :REAL => 9,
- :NAME => 10,
- :DATE => 11,
- :TIME => 12,
- :ZONE => 13,
- "(" => 14,
- ")" => 15 }
+racc_reduce_table = [
+  0, 0, :racc_error,
+  0, 17, :_reduce_none,
+  1, 17, :_reduce_2,
+  1, 17, :_reduce_3,
+  1, 18, :_reduce_none,
+  3, 18, :_reduce_5,
+  3, 18, :_reduce_6,
+  1, 19, :_reduce_none,
+  1, 19, :_reduce_none,
+  2, 19, :_reduce_9,
+  3, 19, :_reduce_10,
+  3, 19, :_reduce_11,
+  3, 19, :_reduce_12,
+  3, 19, :_reduce_13,
+  1, 22, :_reduce_14,
+  2, 22, :_reduce_15,
+  3, 22, :_reduce_16,
+  3, 22, :_reduce_17,
+  1, 20, :_reduce_none,
+  3, 20, :_reduce_19,
+  1, 23, :_reduce_20,
+  1, 23, :_reduce_21,
+  1, 21, :_reduce_none,
+  3, 21, :_reduce_23,
+  1, 24, :_reduce_24,
+  2, 24, :_reduce_25,
+  3, 24, :_reduce_26 ]
 
-racc_use_result_var = false
+racc_reduce_n = 27
+
+racc_shift_n = 39
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :INT => 2,
+  :ERR => 3,
+  :SHIFT => 4,
+  :SPACE => 5,
+  :MULTIPLY => 6,
+  :DIVIDE => 7,
+  :EXPONENT => 8,
+  :REAL => 9,
+  :NAME => 10,
+  :DATE => 11,
+  :TIME => 12,
+  :ZONE => 13,
+  "(" => 14,
+  ")" => 15 }
 
 racc_nt_base = 16
 
+racc_use_result_var = false
+
 Racc_arg = [
- racc_action_table,
- racc_action_check,
- racc_action_default,
- racc_action_pointer,
- racc_goto_table,
- racc_goto_check,
- racc_goto_default,
- racc_goto_pointer,
- racc_nt_base,
- racc_reduce_table,
- racc_token_table,
- racc_shift_n,
- racc_reduce_n,
- racc_use_result_var ]
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
 
 Racc_token_to_s_table = [
-'$end',
-'error',
-'INT',
-'ERR',
-'SHIFT',
-'SPACE',
-'MULTIPLY',
-'DIVIDE',
-'EXPONENT',
-'REAL',
-'NAME',
-'DATE',
-'TIME',
-'ZONE',
-'"("',
-'")"',
-'$start',
-'unit_spec',
-'origin_exp',
-'unit_exp',
-'value_exp',
-'timestamp',
-'power_exp',
-'number_exp',
-'time_exp']
+  "$end",
+  "error",
+  "INT",
+  "ERR",
+  "SHIFT",
+  "SPACE",
+  "MULTIPLY",
+  "DIVIDE",
+  "EXPONENT",
+  "REAL",
+  "NAME",
+  "DATE",
+  "TIME",
+  "ZONE",
+  "\"(\"",
+  "\")\"",
+  "$start",
+  "unit_spec",
+  "origin_exp",
+  "unit_exp",
+  "value_exp",
+  "timestamp",
+  "power_exp",
+  "number_exp",
+  "time_exp" ]
 
 Racc_debug_parser = false
 
-##### racc system variables end #####
+##### State transition tables end #####
 
- # reduce 0 omitted
+# reduce 0 omitted
 
- # reduce 1 omitted
+# reduce 1 omitted
 
-  def _reduce_2( val, _values)
- yyaccept;
+module_eval(<<'.,.,', 'units.racc', 9)
+  def _reduce_2(val, _values)
+     val[0] 
   end
+.,.,
 
-  def _reduce_3( val, _values)
- yyerrok
+module_eval(<<'.,.,', 'units.racc', 10)
+  def _reduce_3(val, _values)
+     yyerrok 
   end
+.,.,
 
- # reduce 4 omitted
+# reduce 4 omitted
 
-  def _reduce_5( val, _values)
- val[0].shift(val[2])
+module_eval(<<'.,.,', 'units.racc', 15)
+  def _reduce_5(val, _values)
+     val[0].shift(val[2]) 
   end
+.,.,
 
-  def _reduce_6( val, _values)
- val[0].shift(val[2])
+module_eval(<<'.,.,', 'units.racc', 16)
+  def _reduce_6(val, _values)
+     val[0].shift(val[2]) 
   end
+.,.,
 
- # reduce 7 omitted
+# reduce 7 omitted
 
- # reduce 8 omitted
+# reduce 8 omitted
 
-  def _reduce_9( val, _values)
- val[0].mul(val[1])
+module_eval(<<'.,.,', 'units.racc', 22)
+  def _reduce_9(val, _values)
+     val[0].mul(val[1]) 
   end
+.,.,
 
-  def _reduce_10( val, _values)
- val[0].mul(val[2])
+module_eval(<<'.,.,', 'units.racc', 23)
+  def _reduce_10(val, _values)
+     val[0].mul(val[2]) 
   end
+.,.,
 
-  def _reduce_11( val, _values)
- val[0].divide(val[2])
+module_eval(<<'.,.,', 'units.racc', 24)
+  def _reduce_11(val, _values)
+     val[0].divide(val[2]) 
   end
+.,.,
 
-  def _reduce_12( val, _values)
- val[0].mul(val[2])
+module_eval(<<'.,.,', 'units.racc', 25)
+  def _reduce_12(val, _values)
+     val[0].mul(val[2]) 
   end
+.,.,
 
-  def _reduce_13( val, _values)
- val[0].divide(val[2])
+module_eval(<<'.,.,', 'units.racc', 26)
+  def _reduce_13(val, _values)
+     val[0].divide(val[2]) 
   end
+.,.,
 
-  def _reduce_14( val, _values)
- NameNode.new(val[0])
+module_eval(<<'.,.,', 'units.racc', 30)
+  def _reduce_14(val, _values)
+     NameNode.new(val[0]) 
   end
+.,.,
 
-  def _reduce_15( val, _values)
- val[0].pow(val[1])
+module_eval(<<'.,.,', 'units.racc', 31)
+  def _reduce_15(val, _values)
+     val[0].pow(val[1]) 
   end
+.,.,
 
-  def _reduce_16( val, _values)
- val[0].pow(val[2])
+module_eval(<<'.,.,', 'units.racc', 32)
+  def _reduce_16(val, _values)
+     val[0].pow(val[2]) 
   end
+.,.,
 
-  def _reduce_17( val, _values)
- val[1]
+module_eval(<<'.,.,', 'units.racc', 33)
+  def _reduce_17(val, _values)
+     val[1] 
   end
+.,.,
 
- # reduce 18 omitted
+# reduce 18 omitted
 
-  def _reduce_19( val, _values)
- val[1]
+module_eval(<<'.,.,', 'units.racc', 38)
+  def _reduce_19(val, _values)
+     val[1] 
   end
+.,.,
 
-  def _reduce_20( val, _values)
- NumberNode.new(val[0])
+module_eval(<<'.,.,', 'units.racc', 42)
+  def _reduce_20(val, _values)
+     NumberNode.new(val[0]) 
   end
+.,.,
 
-  def _reduce_21( val, _values)
- NumberNode.new(val[0])
+module_eval(<<'.,.,', 'units.racc', 43)
+  def _reduce_21(val, _values)
+     NumberNode.new(val[0]) 
   end
+.,.,
 
- # reduce 22 omitted
+# reduce 22 omitted
 
-  def _reduce_23( val, _values)
- val[1]
+module_eval(<<'.,.,', 'units.racc', 48)
+  def _reduce_23(val, _values)
+     val[1] 
   end
+.,.,
 
-  def _reduce_24( val, _values)
- TimeNode.new(val[0], 0.0, 0)
+module_eval(<<'.,.,', 'units.racc', 52)
+  def _reduce_24(val, _values)
+     TimeNode.new(val[0], 0.0, 0) 
   end
+.,.,
 
-  def _reduce_25( val, _values)
- TimeNode.new(val[0], val[1], 0)
+module_eval(<<'.,.,', 'units.racc', 53)
+  def _reduce_25(val, _values)
+     TimeNode.new(val[0], val[1], 0) 
   end
+.,.,
 
-  def _reduce_26( val, _values)
- TimeNode.new(val[0], val[1], val[2])
+module_eval(<<'.,.,', 'units.racc', 54)
+  def _reduce_26(val, _values)
+     TimeNode.new(val[0], val[1], val[2]) 
   end
+.,.,
 
- def _reduce_none( val, _values)
+def _reduce_none(val, _values)
   val[0]
- end
+end
 
-end   # class Units
-end   # module NumRu
+  end   # class Units
+  end   # module NumRu
 
 ####################
 if $0 == __FILE__
@@ -3390,7 +2985,7 @@ if $0 == __FILE__
   
   puts "=== reduce1 ==="
   
-  assert Units.new('').reduce1.to_s, ""
+  assert Units.new('').reduce1.to_s, "1"
   assert Units.new('m').reduce1.to_s, "m"
   assert Units.new('3').reduce1.to_s, "3"
   assert Units.new('3.14').reduce1.to_s, "3.14"
@@ -3457,25 +3052,25 @@ if $0 == __FILE__
   assert Units.new('km2').reduce4.to_s, "km2"
   assert Units.new('hours.hour').reduce4.to_s, "hour2"
   assert Units.new('(10)^2').reduce4.to_s, "100"
-  assert Units.new('100/10').reduce4.to_s, "10.0"
-  assert Units.new('(10)^2/100').reduce4.to_s, "1.0"
+  assert Units.new('100/10').reduce4.to_s, "10"
+  assert Units.new('(10)^2/100').reduce4.to_s, "1"
   
   puts "=== reduce5 ==="
   
   assert Units.new('km2').reduce5.to_s, "1000000 m2"
-  assert Units.new('(10)^2/100').reduce5.to_s, "1.0"
+  assert Units.new('(10)^2/100').reduce5.to_s, "1"
   
   assert Units.new('hPa').reduce5.to_s, "100 kg.m-1 s-2"
-  assert Units.new('mb').reduce5.to_s, "100.0 kg.m-1 s-2"
+  assert Units.new('mb').reduce5.to_s, "100 kg.m-1 s-2"
   
-  assert Units.new('hPa/mb').reduce5.to_s, "1.0"
+  assert Units.new('hPa/mb').reduce5.to_s, "1"
   
   assert Units.new('(K @ 273.15)@ 10').reduce5.to_s, "(K @ 283.15)"
   
   puts "=== APPLICATIONS ==="
   
   assert Units.new('km @ 2').convert(3, Units.new('m @ 100')), 4900
-  assert Units.new('degree_F').convert(32, Units.new('K')).to_s, "273.15"
+  assert Units.new('degree_F').convert(32, Units.new('K')).to_s, ((32+459.67)*(1.8**-1)).to_s
   
   u1 = Units.new('m/s')
   u2 = Units.new('mm/s')