Moved the class UnicodeClasses to src/codegen/unicode, so that it is

only built when the classes.xml file is regenerated. Modified the
build file accordingly. Restored Java 5 features in
UnicodeClasses. Created a License utility class. Added a license
statement and a generated file statement to classes.xml. Made
GenerateLineBreakUtils.java use the License class, and made it avoid
trailing spaces in the generated file.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@810896 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 24 insertions, 354 deletions

diff --git a/src/java/org/apache/fop/hyphenation/UnicodeClasses.java b/src/java/org/apache/fop/hyphenation/UnicodeClasses.java
deleted file mode 100644
index 328ba8e7a..000000000
--- a/src/java/org/apache/fop/hyphenation/UnicodeClasses.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.hyphenation;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Create the default classes file classes.xml,
- * for use in building hyphenation patterns
- * from pattern files which do not contain their own classes.
- * The class contains three methods to do that.
- * The method fromJava gets its infirmation from Java's compiled-in Unicode Character Database,
- * the method fromUCD gets its information from the UCD files,
- * the method fromTeX gets its information from the file unicode-letters-XeTeX.tex,
- * which is the basis of XeTeX's unicode support.
- * In the build file only the method from UCD is used;
- * the other two methods are there for demonstration.
- * The methods fromJava and fromTeX are commented out because they are not Java 1.4 compliant.
- */
-public final class UnicodeClasses {
-    
-    /**
-     * default path relative to the FOP base directory
-     */
-    public static final String CLASSES_XML = "src/java/org/apache/fop/hyphenation/classes.xml";
-    
-    /**
-     * Disallow constructor for this utility class
-     */
-    private UnicodeClasses() { }
-
-    /**
-     * Generate classes.xml from Java's compiled-in Unicode Character Database
-     * @param hexcode whether to prefix each class with the hexcode (only for debugging purposes)
-     * @param outfilePath output file
-     * @throws IOException
-     */
-/*    public static void fromJava(boolean hexcode, String outfilePath) throws IOException {
-        File f = new File(outfilePath);
-        if (f.exists()) {
-            f.delete();
-        }
-        f.createNewFile();
-        FileOutputStream fw = new FileOutputStream(f);
-        OutputStreamWriter ow = new OutputStreamWriter(fw, "utf-8");
-        int maxChar;
-        maxChar = Character.MAX_VALUE;
-
-        ow.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + 
-        "<classes>\n");
-        // loop over the first Unicode plane
-        for (int code = Character.MIN_VALUE; code <= maxChar; ++code) {
-            
-            // skip surrogate area
-            if (code == Character.MIN_SURROGATE) {
-                code = Character.MAX_SURROGATE;
-                continue;
-            }
-
-            // we are only interested in LC, UC and TC letters which are their own LC,
-            // and in 'other letters'
-            if (!(((Character.isLowerCase(code) || Character.isUpperCase(code)
-                    || Character.isTitleCase(code))
-                    && code == Character.toLowerCase(code))
-                    || Character.getType(code) == Character.OTHER_LETTER)) {
-                continue;
-            }
-            
-            // skip a number of blocks
-            Character.UnicodeBlock ubi = Character.UnicodeBlock.of(code);
-            if (ubi.equals(Character.UnicodeBlock.SUPERSCRIPTS_AND_SUBSCRIPTS)
-                    || ubi.equals(Character.UnicodeBlock.LETTERLIKE_SYMBOLS)
-                    || ubi.equals(Character.UnicodeBlock.ALPHABETIC_PRESENTATION_FORMS)
-                    || ubi.equals(Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS)
-                    || ubi.equals(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS)
-                    || ubi.equals(Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A)
-                    || ubi.equals(Character.UnicodeBlock.HANGUL_SYLLABLES)) {
-                continue;
-            }
-
-            int uppercode = Character.toUpperCase(code);
-            int titlecode = Character.toTitleCase(code);
-            StringBuilder s = new StringBuilder();
-            if (hexcode) {
-                s.append("0x" + Integer.toHexString(code) + " ");
-            }
-            s.append(Character.toChars(code));
-            if (uppercode != code) {
-                s.append(Character.toChars(uppercode));
-            }
-            if (titlecode != code && titlecode != uppercode) {
-                s.append(Character.toChars(titlecode));
-            }
-            ow.write(s.toString() + "\n");
-        }
-        ow.write("</classes>\n");
-        ow.flush();
-        ow.close();
-    }
-*/    
-    
-    /**
-     * The column numbers in the UCD file
-     */
-    public static final int UNICODE = 0, GENERAL_CATEGORY = 2, SIMPLE_UPPERCASE_MAPPING = 12,
-    SIMPLE_LOWERCASE_MAPPING = 13, SIMPLE_TITLECASE_MAPPING = 14, NUM_FIELDS = 15;
-    
-    /**
-     * Generate classes.xml from Unicode Character Database files
-     * @param hexcode whether to prefix each class with the hexcode (only for debugging purposes)
-     * @param unidataPath path to the directory with UCD files  
-     * @param outfilePath output file
-     * @throws IOException if the input files are not found
-     */
-    public static void fromUCD(boolean hexcode, String unidataPath, String outfilePath)
-    throws IOException {
-        File unidata = new File(unidataPath);
-        
-        File f = new File(outfilePath);
-        if (f.exists()) {
-            f.delete();
-        }
-        f.createNewFile();
-        FileOutputStream fw = new FileOutputStream(f);
-        OutputStreamWriter ow = new OutputStreamWriter(fw, "utf-8");
-        
-        File in = new File(unidata, "Blocks.txt");
-        FileInputStream inis = new FileInputStream(in);
-        InputStreamReader insr = new InputStreamReader(inis, "utf-8");
-        BufferedReader inbr = new BufferedReader(insr);
-        Map blocks = new HashMap();
-        for (String line = inbr.readLine(); line != null; line = inbr.readLine()) {
-            if (line.startsWith("#") || line.matches("^\\s*$")) {
-                continue;
-            }
-            String[] parts = line.split(";");
-            String block = parts[1].trim();
-            String[] indices = parts[0].split("\\.\\.");
-            int[] ind = {Integer.parseInt(indices[0], 16), Integer.parseInt(indices[1], 16)};
-            blocks.put(block, ind);
-        }
-        inbr.close();
-
-        in = new File(unidata, "UnicodeData.txt");
-        inis = new FileInputStream(in);
-        insr = new InputStreamReader(inis, "utf-8");
-        inbr = new BufferedReader(insr);
-        int maxChar;
-        maxChar = Character.MAX_VALUE;
-
-        ow.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-                 + "<classes>\n");
-        for (String line = inbr.readLine(); line != null; line = inbr.readLine()) {
-            String[] fields = line.split(";", NUM_FIELDS);
-            int code = Integer.parseInt(fields[UNICODE], 16);
-            if (code > maxChar) {
-                break;
-            }
-            if (((fields[GENERAL_CATEGORY].equals("Ll") || fields[GENERAL_CATEGORY].equals("Lu")
-                            || fields[GENERAL_CATEGORY].equals("Lt"))
-                        && ("".equals(fields[SIMPLE_LOWERCASE_MAPPING])
-                                || fields[UNICODE].equals(fields[SIMPLE_LOWERCASE_MAPPING])))
-                    || fields[GENERAL_CATEGORY].equals("Lo")) {
-                String[] blockNames = {"Superscripts and Subscripts",
-                                       "Letterlike Symbols",
-                                       "Alphabetic Presentation Forms",
-                                       "Halfwidth and Fullwidth Forms",
-                                       "CJK Unified Ideographs",
-                                       "CJK Unified Ideographs Extension A",
-                                       "Hangul Syllables"};
-                int j;
-                for (j = 0; j < blockNames.length; ++j) {
-                    int[] ind = (int[]) blocks.get(blockNames[j]);
-                    if (code >= ind[0] && code <= ind[1]) {
-                        break;
-                    }
-                }
-                if (j < blockNames.length) {
-                    continue;
-                }
-            
-                int uppercode = -1, titlecode = -1;
-                if (!"".equals(fields[SIMPLE_UPPERCASE_MAPPING])) {
-                    uppercode = Integer.parseInt(fields[SIMPLE_UPPERCASE_MAPPING], 16);
-                }
-                if (!"".equals(fields[SIMPLE_TITLECASE_MAPPING])) {
-                    titlecode = Integer.parseInt(fields[SIMPLE_TITLECASE_MAPPING], 16);
-                }
-                StringBuffer s = new StringBuffer();
-                if (hexcode) {
-                    s.append("0x" + fields[UNICODE].replaceFirst("^0+", "").toLowerCase() + " ");
-                }
-                // s.append(Character.toChars(code));
-                /* This cast only works correctly when we do not exceed Character.MAX_VALUE */
-                s.append((char) code);
-                if (uppercode != -1 && uppercode != code) {
-                    // s.append(Character.toChars(uppercode));
-                    s.append((char) uppercode);
-                }
-                if (titlecode != -1 && titlecode != code && titlecode != uppercode) {
-                    // s.append(Character.toChars(titlecode));
-                    s.append((char) titlecode);
-                }
-                ow.write(s.toString() + "\n");
-            }
-        }
-        ow.write("</classes>\n");
-        ow.flush();
-        ow.close();
-        inbr.close();
-    }
-
-    /**
-     * Generate classes.xml from XeTeX's Unicode letters file
-     * @param hexcode whether to prefix each class with the hexcode (only for debugging purposes)
-     * @param lettersPath path to XeTeX's Unicode letters file unicode-letters-XeTeX.tex  
-     * @param outfilePath output file
-     * @throws IOException
-     */
-/*    public static void fromTeX(boolean hexcode, String lettersPath, String outfilePath)
-      throws IOException {
-        File in = new File(lettersPath);
-
-        File f = new File(outfilePath);
-        if (f.exists()) {
-            f.delete();
-        }
-        f.createNewFile();
-        FileOutputStream fw = new FileOutputStream(f);
-        OutputStreamWriter ow = new OutputStreamWriter(fw, "utf-8");
-
-        FileInputStream inis = new FileInputStream(in);
-        InputStreamReader insr = new InputStreamReader(inis, "utf-8");
-        BufferedReader inbr = new BufferedReader(insr);
-
-        ow.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + 
-        "<classes>\n");
-        for (String line = inbr.readLine(); line != null; line = inbr.readLine()) {
-            String[] codes = line.split("\\s+");
-            if (!(codes[0].equals("\\L") || codes[0].equals("\\l"))) {
-                continue;
-            }
-            if (codes.length == 3) {
-                ow.write("\"" + line + "\" has two codes");
-                continue;
-            }
-            if (codes[0].equals("\\l") && codes.length != 2) {
-                ow.write("\"" + line + "\" should have one code");
-                continue;
-            }
-            else if (codes[0].equals("\\L") && codes.length != 4) {
-                ow.write("\"" + line + "\" should have three codes");
-                continue;
-            }
-            if (codes[0].equals("\\l") || (codes[0].equals("\\L") && codes[1].equals(codes[3]))) {
-                StringBuilder s = new StringBuilder();
-                if (hexcode) {
-                    s.append("0x" + codes[1].replaceFirst("^0+", "").toLowerCase() + " ");
-                }
-                s.append((char) Integer.parseInt(codes[1], 16));
-                if (codes[0].equals("\\L")) {
-                    s.append((char) Integer.parseInt(codes[2], 16));
-                }
-                ow.write(s.toString() + "\n");
-            }
-        }
-        ow.write("</classes>\n");
-        ow.flush();
-        ow.close();
-        inbr.close();
-    }
-*/
-    
-    /**
-     * @param args [--hexcode] [--java|--ucd|--tex] [--out outfile] infile
-     * @throws IOException if the input file cannot be found
-     */
-    public static void main(String[] args) throws IOException {
-        String type = "ucd", prefix = "--", infile = null, outfile = CLASSES_XML;
-        boolean hexcode = false;
-        for (int i = 0; i < args.length; ++i) {
-            if (args[i].startsWith(prefix)) {
-                String option = args[i].substring(prefix.length());
-                if (option.equals("java") || option.equals("ucd") || option.equals("tex")) {
-                    type = option;
-                } else if (option.equals("hexcode")) {
-                    hexcode = true;
-                } else if (option.equals("out")) {
-                    outfile = args[++i];
-                } else {
-                    System.err.println("Unknown option: " + option);
-                    System.exit(1);
-                }
-            } else {
-                if (infile != null) {
-                    System.err.println("Only one non-option argument can be given, for infile");
-                    System.exit(1);
-                }
-                infile = args[i];
-            }
-        }
-        
-        if (type.equals("java")) {
-            if (infile != null) {
-                System.err.println("Type java does not allow an infile");
-                System.exit(1);
-            }
-        } else {
-            if (infile == null) {
-                System.err.println("Types ucd and tex require an infile");
-                System.exit(1);
-            }
-        }
-/*        if (type.equals("java")) {
-            fromJava(hexcode, outfile);
-        } else
- */     
-        if (type.equals("ucd")) {
-            fromUCD(hexcode, infile, outfile);
-/*        } else if (type.equals("tex")) {
-            fromTeX(hexcode, infile, outfile);
-*/        
-            } else {
-            System.err.println("Unknown type: " + type + ", nothing done");
-            System.exit(1);
-        }
-    }
-
-}
diff --git a/src/java/org/apache/fop/hyphenation/classes.xml b/src/java/org/apache/fop/hyphenation/classes.xml
index bf5c29758..056a533a8 100644
--- a/src/java/org/apache/fop/hyphenation/classes.xml
+++ b/src/java/org/apache/fop/hyphenation/classes.xml
@@ -1,4 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more       -->
+<!-- contributor license agreements.  See the NOTICE file distributed with    -->
+<!-- this work for additional information regarding copyright ownership.      -->
+<!-- The ASF licenses this file to You under the Apache License, Version 2.0  -->
+<!-- (the "License"); you may not use this file except in compliance with     -->
+<!-- the License.  You may obtain a copy of the License at                    -->
+<!--                                                                          -->
+<!--      http://www.apache.org/licenses/LICENSE-2.0                          -->
+<!--                                                                          -->
+<!-- Unless required by applicable law or agreed to in writing, software      -->
+<!-- distributed under the License is distributed on an "AS IS" BASIS,        -->
+<!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -->
+<!-- See the License for the specific language governing permissions and      -->
+<!-- limitations under the License.                                           -->
+
+<!-- $Id$ -->
+
+<!-- !!! THIS IS A GENERATED FILE !!!             -->
+<!-- If updates are needed, then:                 -->
+<!-- * run 'ant codegen-hyphenation-classes',     -->
+<!--   which will generate a new file classes.xml -->
+<!--   in 'src/java/org/apache/fop/hyphenation'   -->
+<!-- * commit the changed file                    -->
+
 <classes>
 aA
 bB