[sword-svn] r244 - in trunk/source/data/translit/crosswire: . cldr

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-11-10 22:14:44 -0700 (Sun, 10 Nov 2013)
New Revision: 244

Modified:
   trunk/source/data/translit/crosswire/cldr/cldr2icu.pl
   trunk/source/data/translit/crosswire/icu2cldr.pl
Log:
completed major changes to conversion between ICU & CLDR

Modified: trunk/source/data/translit/crosswire/cldr/cldr2icu.pl
===================================================================
--- trunk/source/data/translit/crosswire/cldr/cldr2icu.pl	2013-11-10 10:49:34 UTC (rev 243)
+++ trunk/source/data/translit/crosswire/cldr/cldr2icu.pl	2013-11-11 05:14:44 UTC (rev 244)
@@ -35,7 +35,6 @@
     $doc .= "# ***************************************************************************\n";
     $doc .= "# File: " . $file . "\n";
     $doc .= "# Generated from CLDR\n";
-    $doc .= "#\n";
     
     while (<INF>) {
 	my $line = $_;
@@ -55,15 +54,21 @@
 	    $line =~ s/&gt;/>/g;
 	    $line =~ s/&amp;/&/g;
 
-	    $line =~ s/\\u([0-9A-Fa-f]{1,6})/chr(hex($1))/eg;
-	    
+	    #$line =~ s/\\u([0-9A-Fa-f]{1,6})/chr(hex($1))/eg;
+
 	    $line = NFD($line);
 	    
 	    $doc .= $line . "\n";
 	}
+	else {
+	    $doc .= "\n";
+	}
     }
 
     $doc =~ s/<!--.+?-->[\s]*//s;
+    $doc =~ s/\n\n+/\n\n/s;
+    $doc =~ s/\s*$//s;
+    $doc .= "\n";
 
     print OUTF "$doc";    
     close (OUTF);

Modified: trunk/source/data/translit/crosswire/icu2cldr.pl
===================================================================
--- trunk/source/data/translit/crosswire/icu2cldr.pl	2013-11-10 10:49:34 UTC (rev 243)
+++ trunk/source/data/translit/crosswire/icu2cldr.pl	2013-11-11 05:14:44 UTC (rev 244)
@@ -48,7 +48,7 @@
 	    $line = NFD($line);
 
 	    if ($line =~ /^\#/) {
-		if ($line =~ /^\# \*\s*$/) {} #temporary; remove when CLDR data is in good shape
+		if ($line =~ /^\# \*/) {} #temporary; remove when CLDR data is in good shape
 		elsif ($line =~ /^\# (File:|Generated from CLDR)/) {}
 		elsif ($line =~ /^\#[\s\-]*$/) {} #temporary; remove when CLDR data is in good shape
 		else {