From 96aa56039fe3305b6ef6963a8efc5692d9f6062b Mon Sep 17 00:00:00 2001
From: Hugo van der Merwe <hugovdm@gmail.com>
Date: Thu, 16 Jan 2020 17:00:37 +0100
Subject: [PATCH 1/3] CLDR-13488: sample units.txt with constants, area and
 temperature units.

Sample XML was taken from:
- Branch: macchiati:CLDR-13488-add-unit-conversions
- https://github.com/unicode-org/cldr/pull/291
- https://github.com/macchiati/cldr/commit/0366c96b3b41d9834fea5f9360ff484b0a8ace0c
---
 icu4c/source/data/misc/units.txt | 54 ++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 icu4c/source/data/misc/units.txt

diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt
new file mode 100644
index 00000000000..de5c75abd7a
--- /dev/null
+++ b/icu4c/source/data/misc/units.txt
@@ -0,0 +1,54 @@
+// TODO(CLDR-13488): This is a sample of the unitConstants and convertUnits
+// entries we intend to produce. Once all the plumbing is done, data is expected
+// to come from CDLR's common/supplemental/units.xml.
+//
+// The expected source XML for each of these lines is presented in comments.
+
+supplementalData:table(nofallback){
+    unitConstants{
+        // <unitConstant constant="f2m" value="0.3048"/>
+        f2m{"0.3048"}
+        // <unitConstant constant="lb2kg" value="0.45359237"/>
+        lb2kg{"0.45359237"}
+        // <unitConstant constant="gravity" value="9.80665"/>
+        gravity{"9.80665"}
+        // <unitConstant constant="PI" value="3.1415926535897932384626433832795"/>
+        PI{"3.1415926535897932384626433832795"}
+        // <unitConstant constant="cup2m3" value="231*f2m*f2m*f2m/16*12*12*12"/>
+        cup2m3{"231*f2m*f2m*f2m/16*12*12*12"}
+    }
+    convertUnits{
+        // <convertUnit source='one' target='1' factor='1'/>
+        1{
+            one:table{
+                factor{"1"}
+            }
+        }
+        // <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{"273.15"}
+            }
+            kelvin:table{
+                factor{"1"}
+                offset{"273.15"}
+            }
+        }
+        // <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"}
+            }
+        }
+    }
+}

From 5c0a15794c82a7ddfe1ce791603b910b581d56c0 Mon Sep 17 00:00:00 2001
From: Hugo van der Merwe <hugovdm@gmail.com>
Date: Thu, 16 Jan 2020 17:30:42 +0100
Subject: [PATCH 2/3] Fix erroneous F-to-C offset.

---
 icu4c/source/data/misc/units.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt
index de5c75abd7a..d029e9005c8 100644
--- a/icu4c/source/data/misc/units.txt
+++ b/icu4c/source/data/misc/units.txt
@@ -29,7 +29,7 @@ supplementalData:table(nofallback){
         celsius{
             fahrenheit:table{
                 factor{"5/9"}
-                offset{"273.15"}
+                offset{"-160/9"}
             }
             kelvin:table{
                 factor{"1"}

From 459cf4d7511c75bd073ec39636d2303d1ae2c2d7 Mon Sep 17 00:00:00 2001
From: Hugo van der Merwe <hugovdm@gmail.com>
Date: Fri, 17 Jan 2020 11:46:48 +0100
Subject: [PATCH 3/3] Fix LdmlConverter.java indentation.

---
 .../main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
index 50c79cc117d..a0b92a2b902 100644
--- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
+++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
@@ -269,7 +269,7 @@ public final class LdmlConverter {
                 .collect(toImmutableList());
 
         if (splitDirs.isEmpty()) {
-          return;
+            return;
         }
 
         Map<IcuLocaleDir, DependencyGraph> graphMetadata = new HashMap<>();