fix units.txt style: flatten the structure

diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt
index 8baee9d60c5ea4abde35866731f6eeeb6a142a8a..20e7bb64d6c70f2e68691e90331d6a4fbae819a1 100644 (file)
--- a/icu4c/source/data/misc/units.txt
+++ b/icu4c/source/data/misc/units.txt
@@ -18,37 +18,37 @@ units:table(nofallback){
         cup2m3{"231*f2m*f2m*f2m/16*12*12*12"}
     }
     convertUnits{
-        // <convertUnit source='one' target='1' factor='1'/>
-        1{
-            one:table{
-                factor{"1"}
-            }
+        // <convertUnit source='one' target='one' factor='1'/>
+        one{
+            factor{"1"}
+            target{"one"}
         }
         // <convertUnit source='fahrenheit' target='celsius' factor='5/9' offset='-160/9'/>
         // <convertUnit source='kelvin' target='celsius' factor='1' offset='273.15'/>
-        celsius{
-            fahrenheit:table{
-                factor{"5/9"}
-                offset{"-160/9"}
-            }
-            kelvin:table{
-                factor{"1"}
-                offset{"273.15"}
-            }
+        fahrenheit{
+            factor{"5/9"}
+            offset{"-160/9"}
+            target{"celsius"}
+        }
+        kelvin{
+            factor{"1"}
+            offset{"273.15"}
+            target{"celsius"}
         }
         // <convertUnit source='hectare' target='square-meter' factor='10000'/>
         // <convertUnit source='acre' target='square-meter' factor='f2m^2 * 43560'/>
         // <convertUnit source='dunam' target='square-meter' factor='1000'/>
-        square-meter{
-            hectare:table{
-                factor{"10000"}
-            }
-            acre:table{
-                factor{"f2m^2 * 43560"}
-            }
-            dunam:table{
-                factor{"1000"}
-            }
+        hectare{
+            factor{"10000"}
+            target{"square-meter"}
+        }
+        acre{
+            factor{"f2m^2 * 43560"}
+            target{"square-meter"}
+        }
+        dunam{
+            factor{"1000"}
+            target{"square-meter"}
         }
     }
 }