xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acumis...@apache.org
Subject svn commit: r674497 [3/11] - in /xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./ lib/ lib/build/ src/codegen/unicode/data/ src/codegen/unicode/java/org/apache/fop/text/linebreak/ src/documentation/ src/documentation/content/xdocs/ src/documentation...
Date Mon, 07 Jul 2008 14:09:10 GMT
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java Mon Jul  7 07:09:01 2008
@@ -30,7 +30,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 /**
  * <p>Utility for generating a Java class representing line break properties
@@ -55,6 +54,7 @@
     private static final byte COMBINING_PROHIBITED_BREAK = 3;   // @ in table
     private static final byte PROHIBITED_BREAK = 4;             // ^ in table
     private static final byte EXPLICIT_BREAK = 5;               // ! in rules
+    private static final String BREAK_CLASS_TOKENS = "_%#@^!";
     private static final String notInPairTable[] = { "AI", "BK", "CB", "CR", "LF", "NL", "SA", "SG", "SP", "XX" };
 
     private static final byte lineBreakProperties[] = new byte[0x10000];
@@ -103,27 +103,32 @@
         BufferedReader b = new BufferedReader(new FileReader(breakPairFileName));
         String line = b.readLine();
         int lineNumber = 1;
+        String[] lineTokens;
+        String name;
         // read header
         if (line != null) {
-            StringTokenizer tok = new StringTokenizer(line);
+            lineTokens = line.split("\\s+");
             byte columnNumber = 0;
-            while (tok.hasMoreTokens()) {
-                String name = tok.nextToken();
-                if (columnNumber >= columnHeader.length) {
-                    throw new Exception(breakPairFileName + ':' + lineNumber + ": unexpected column header " + name);
-                }
-                if (notInPairTableMap.get(name) != null) {
-                    throw new Exception(breakPairFileName + ':' + lineNumber + ": invalid column header " + name);
-                }
-                Byte v = (Byte)lineBreakPropertyValues.get(name);
-                if (v != null) {
-                    byte vv = v.byteValue();
-                    columnHeader[columnNumber] = vv;
-                    columnMap[vv] = columnNumber;
-                } else {
-                    throw new Exception(breakPairFileName + ':' + lineNumber + ": unknown column header " + name);
+            
+            for (int i = 0; i < lineTokens.length; ++i) {
+                name = lineTokens[i];
+                if (name.length() > 0) {
+                    if (columnNumber >= columnHeader.length) {
+                        throw new Exception(breakPairFileName + ':' + lineNumber + ": unexpected column header " + name);
+                    }
+                    if (notInPairTableMap.get(name) != null) {
+                        throw new Exception(breakPairFileName + ':' + lineNumber + ": invalid column header " + name);
+                    }
+                    Byte v = (Byte)lineBreakPropertyValues.get(name);
+                    if (v != null) {
+                        byte vv = v.byteValue();
+                        columnHeader[columnNumber] = vv;
+                        columnMap[vv] = columnNumber;
+                    } else {
+                        throw new Exception(breakPairFileName + ':' + lineNumber + ": unknown column header " + name);
+                    }
+                    columnNumber++;
                 }
-                columnNumber++;
             }
             if (columnNumber < columnHeader.length) {
                 StringBuffer missing = new StringBuffer();
@@ -156,9 +161,9 @@
                 throw new Exception(breakPairFileName + ':' + lineNumber + ": unexpected row " + line);
             }
             pairTable[rowNumber] = new byte[tableSize];
-            StringTokenizer tok = new StringTokenizer(line);
-            if (tok.hasMoreTokens()) {
-                String name = tok.nextToken();
+            lineTokens = line.split("\\s+");
+            if (lineTokens.length > 0) {
+                name = lineTokens[0];
                 if (notInPairTableMap.get(name) != null) {
                     throw new Exception(breakPairFileName + ':' + lineNumber + ": invalid row header " + name);
                 }
@@ -174,27 +179,15 @@
                 throw new Exception(breakPairFileName + ':' + lineNumber + ": can't read row header");
             }
             int columnNumber = 0;
-            while (tok.hasMoreTokens()) {
-                String token = tok.nextToken();
+            String token;
+            for (int i = 1; i < lineTokens.length; ++i) {
+                token = lineTokens[i];
                 if (token.length() == 1) {
-                    switch (token.charAt(0)) {
-                        case '^' :
-                            pairTable[rowNumber][columnNumber] = PROHIBITED_BREAK;
-                            break;
-                        case '%' :
-                            pairTable[rowNumber][columnNumber] = INDIRECT_BREAK;
-                            break;
-                        case '_' :
-                            pairTable[rowNumber][columnNumber] = DIRECT_BREAK;
-                            break;
-                        case '#' :
-                            pairTable[rowNumber][columnNumber] = COMBINING_INDIRECT_BREAK;
-                            break;
-                        case '@' :
-                            pairTable[rowNumber][columnNumber] = COMBINING_PROHIBITED_BREAK;
-                            break;
-                        default :
-                            throw new Exception(breakPairFileName + ':' + lineNumber + ": unexpected token: " + token);
+                    byte tokenBreakClass = (byte)BREAK_CLASS_TOKENS.indexOf(token.charAt(0));
+                    if (tokenBreakClass >= 0) {
+                        pairTable[rowNumber][columnNumber] = tokenBreakClass;
+                    } else {
+                        throw new Exception(breakPairFileName + ':' + lineNumber + ": unexpected token: " + token);
                     }
                 } else {
                     throw new Exception(breakPairFileName + ':' + lineNumber + ": token too long: " + token);
@@ -255,23 +248,35 @@
         out.println("package org.apache.fop.text.linebreak;");
         out.println();
         out.println("/* ");
-        out.println(" * This is a generated file, DO NOT CHANGE!");
+        out.println(" * !!! THIS IS A GENERATED FILE !!! ");
+        out.println(" * If updates to the source are needed, then:");
+        out.println(" * - apply the necessary modifications to ");
+        out.println(" *   'src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java'");
+        out.println(" * - run 'ant codegen-unicode', which will generate a new LineBreakUtils.java");
+        out.println(" *   in 'src/java/org/apache/fop/text/linebreak'");
+        out.println(" * - commit BOTH changed files");
         out.println(" */");
         out.println();
-        out.println("class LineBreakUtils {");
+        out.println("public final class LineBreakUtils {");
         out.println();
+        out.println("    /** Break class constant */");
         out.println("    public static final byte DIRECT_BREAK = " + DIRECT_BREAK + ';');
+        out.println("    /** Break class constant */");
         out.println("    public static final byte INDIRECT_BREAK = " + INDIRECT_BREAK + ';');
+        out.println("    /** Break class constant */");
         out.println("    public static final byte COMBINING_INDIRECT_BREAK = " + COMBINING_INDIRECT_BREAK + ';');
+        out.println("    /** Break class constant */");
         out.println("    public static final byte COMBINING_PROHIBITED_BREAK = " + COMBINING_PROHIBITED_BREAK + ';');
+        out.println("    /** Break class constant */");
         out.println("    public static final byte PROHIBITED_BREAK = " + PROHIBITED_BREAK + ';');
+        out.println("    /** Break class constant */");
         out.println("    public static final byte EXPLICIT_BREAK = " + EXPLICIT_BREAK + ';');
         out.println();
         out.println("    private static final byte PAIR_TABLE[][] = {");
         boolean printComma = false;
         for (int i = 1; i <= lineBreakPropertyValueCount; i++) {
             if (printComma) {
-                out.println(',');
+                out.println(", ");
             } else {
                 printComma = true;
             }
@@ -279,7 +284,7 @@
             boolean localPrintComma = false;
             for (int j = 1; j <= lineBreakPropertyValueCount; j++) {
                 if (localPrintComma) {
-                    out.print(',');
+                    out.print(", ");
                 } else {
                     localPrintComma = true;
                 }
@@ -313,7 +318,7 @@
                         found = true;
                         doStaticLinkCode.append("        lineBreakProperties[");
                         doStaticLinkCode.append(i);
-                        doStaticLinkCode.append("]=lineBreakProperties[");
+                        doStaticLinkCode.append("] = lineBreakProperties[");
                         doStaticLinkCode.append(j);
                         doStaticLinkCode.append("];\n");
                         break;
@@ -322,7 +327,7 @@
             }
             if (!found) {
                 if (rowsPrinted >= 64) {
-                    out.println("    };");
+                    out.println("    }");
                     out.println();
                     initSections++;
                     out.println("    private static void init_" + initSections + "() {");
@@ -334,7 +339,7 @@
                 for (int k = 0; k < blocksize; k++) {
                     row[i][k] = lineBreakProperties[idx + k];
                     if (printLocalComma) {
-                        out.print(',');
+                        out.print(", ");
                     } else {
                         printLocalComma = true;
                     }
@@ -345,20 +350,21 @@
             }
             idx += blocksize;
         }
-        out.println("    };");
+        out.println("    }");
         out.println();
         out.println("    static {");
         for (int i = 0; i <= initSections; i++) {
             out.println("        init_" + i + "();");
         }
         out.print(doStaticLinkCode);
-        out.println("    };");
+        out.println("    }");
         out.println();
         for (int i = 0; i < lineBreakPropertyShortNames.size(); i++) {
             String shortName = (String)lineBreakPropertyShortNames.get(i);
+            out.println("    /** Linebreak property constant */");
             out.print("    public static final byte LINE_BREAK_PROPERTY_");
             out.print(shortName);
-            out.print('=');
+            out.print(" = ");
             out.print(i + 1);
             out.println(';');
         }
@@ -368,9 +374,9 @@
         int lineLength = shortNamePrefix.length();
         printComma = false;
         for (int i = 0; i < lineBreakPropertyShortNames.size(); i++) {
-            String name = (String)lineBreakPropertyShortNames.get(i);
+            name = (String)lineBreakPropertyShortNames.get(i);
             if (printComma) {
-                out.print(',');
+                out.print(", ");
                 lineLength++;
             } else {
                 printComma = true;
@@ -392,7 +398,7 @@
         lineLength = longNamePrefix.length();
         printComma = false;
         for (int i = 0; i < lineBreakPropertyLongNames.size(); i++) {
-            String name = (String)lineBreakPropertyLongNames.get(i);
+            name = (String)lineBreakPropertyLongNames.get(i);
             if (printComma) {
                 out.print(',');
                 lineLength++;
@@ -411,32 +417,62 @@
         }
         out.println("};");
         out.println();
+        out.println("    /**");
+        out.println("     * Return the short name for the linebreak property corresponding ");
+        out.println("     * to the given symbolic constant.");
+        out.println("     *");
+        out.println("     * @param i the numeric value of the linebreak property");
+        out.println("     * @return the short name of the linebreak property");
+        out.println("     */");
         out.println("    public static String getLineBreakPropertyShortName(byte i) {");
-        out.println("        if (i>0 && i<=lineBreakPropertyShortNames.length) {");
-        out.println("            return lineBreakPropertyShortNames[i-1];");
+        out.println("        if (i > 0 && i <= lineBreakPropertyShortNames.length) {");
+        out.println("            return lineBreakPropertyShortNames[i - 1];");
         out.println("        } else {");
         out.println("            return null;");
         out.println("        }");
         out.println("    }");
         out.println();
+        out.println("    /**");
+        out.println("     * Return the long name for the linebreak property corresponding ");
+        out.println("     * to the given symbolic constant.");
+        out.println("     *");
+        out.println("     * @param i the numeric value of the linebreak property");
+        out.println("     * @return the long name of the linebreak property");
+        out.println("     */");
         out.println("    public static String getLineBreakPropertyLongName(byte i) {");
-        out.println("        if (i>0 && i<=lineBreakPropertyLongNames.length) {");
-        out.println("            return lineBreakPropertyLongNames[i-1];");
+        out.println("        if (i > 0 && i <= lineBreakPropertyLongNames.length) {");
+        out.println("            return lineBreakPropertyLongNames[i - 1];");
         out.println("        } else {");
         out.println("            return null;");
         out.println("        }");
         out.println("    }");
         out.println();
+        out.println("    /**");
+        out.println("     * Return the linebreak property constant for the given <code>char</code>");
+        out.println("     *");
+        out.println("     * @param c the <code>char</code> whose linebreak property to return");
+        out.println("     * @return the constant representing the linebreak property");
+        out.println("     */");
         out.println("    public static byte getLineBreakProperty(char c) {");
-        out.println("        return lineBreakProperties[c/" + blocksize + "][c%" + blocksize + "];");
+        out.println("        return lineBreakProperties[c / " + blocksize + "][c % " + blocksize + "];");
         out.println("    }");
         out.println();
+        out.println("    /**");
+        out.println("     * Return the break class constant for the given pair of linebreak ");
+        out.println("     * property constants.");
+        out.println("     *");
+        out.println("     * @param lineBreakPropertyBefore the linebreak property for the first character");
+        out.println("     *        in a two-character sequence");
+        out.println("     * @param lineBreakPropertyAfter the linebreak property for the second character");
+        out.println("     *        in a two-character sequence");
+        out.println("     * @return the constant representing the break class");
+        out.println("     */");
         out.println(
-            "    public static byte getLineBreakPairProperty(int lineBreakPropertyBefore,int lineBreakPropertyAfter) {");
-        out.println("        return PAIR_TABLE[lineBreakPropertyBefore-1][lineBreakPropertyAfter-1];");
+            "    public static byte getLineBreakPairProperty(int lineBreakPropertyBefore, int lineBreakPropertyAfter) {");
+        out.println("        return PAIR_TABLE[lineBreakPropertyBefore - 1][lineBreakPropertyAfter - 1];");
         out.println("    }");
         out.println();
-        out.println("};");
+        out.println("}");
         out.flush();
         out.close();
     }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/news.xml Mon Jul  7 07:09:01 2008
@@ -24,6 +24,14 @@
   </header>
   <body>
     <section>
+      <title>26th March 2007 - Apache FOP 0.95beta Released</title>
+      <p>The Apache FOP team is delighted to present you a beta version of the
+        next production grade release of the new FOP codebase. This release
+        contains many bug fixes and new features. See the <a
+          href="0.95/releaseNotes_0.95beta.html">Release Notes</a> for a list of
+        the most important changes.</p>
+    </section>
+    <section>
       <title>30 October 2007 - New Committer</title>
       <p>Welcome Max Berger!</p>
     </section>

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/configuration.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/configuration.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/configuration.xml Mon Jul  7 07:09:01 2008
@@ -294,6 +294,27 @@
       
       <fonts....
       </renderer>]]></source>
+      
+      <p>FOP supports encryption of PDF output, thanks to Patrick C. Lankswert.
+      This feature is commonly used to prevent unauthorized viewing, printing, editing, copying text
+      from the document and doing annotations. It is also possible to ask the user for a password in
+      order to view the contents. Note that there already exist third party applications which can
+      decrypt an encrypted PDF without effort and allow the aforementioned operations, therefore the
+      degree of protection is limited.  For further information about features and restrictions
+      regarding PDF encryption, look at the documentation coming with Adobe Acrobat or the technical
+      documentation on the Adobe web site.</p>
+      <source><![CDATA[
+    <renderer mime="application/pdf">
+      <encryption-params>
+         <user-password>testuserpass</user-password>
+         <owner-password>testownerpass</owner-password>
+         <noprint/>
+         <nocopy/>
+         <noedit/>
+         <noannotations/>
+      </encryption-params>
+    </renderer>]]></source>
+      
     </section>
     <section id="ps-renderer">
       <title>Special Settings for the PostScript Renderer</title>

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/fonts.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/fonts.xml Mon Jul  7 07:09:01 2008
@@ -22,7 +22,7 @@
     <title>Apache FOP: Fonts</title>
     <version>$Revision$</version>
     <authors>
-      <person name="Jeremias Märki" email=""/>
+      <person name="Jeremias M&#xE4;rki" email=""/>
       <person name="Tore Engvig" email=""/>
       <person name="Adrian Cumiskey" email=""/>
       <person name="Max Berger" email=""/>
@@ -96,14 +96,14 @@
           <td>yes (used for layout but not for output)</td>
           <td>no</td>
         </tr>
-        <!--tr> NOT AVAILABLE
+<!--tr> NOT AVAILABLE
           <td>MIF</td>
           <td>n/a (font metrics not needed)</td>
           <td>n/a</td>
           <td>n/a</td>
           <td>n/a</td>
         </tr-->
-        <!--tr> NOT AVAILABLE
+<!--tr> NOT AVAILABLE
           <td>SVG</td>
           <td>if available from OS</td>
           <td>yes</td>
@@ -163,7 +163,6 @@
         PDF or PostScript.
       </p>
     </section>
-    
     <section id="custom">
       <title>Custom Fonts</title>
       <p>
@@ -184,11 +183,14 @@
         Basic information about fonts can be found at:
       </p>
       <ul>
-        <li><a href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</a></li>
-        <li><a href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</a></li>
+        <li>
+          <a href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</a>
+        </li>
+        <li>
+          <a href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</a>
+        </li>
       </ul>
     </section>
-    
     <section id="basics">
       <title>Basic font configuration</title>
       <p>
@@ -220,7 +222,6 @@
         not possible to easily configure fonts from Java code.
       </note>
     </section>
-    
     <section id="advanced">
       <title>Advanced font configuration</title>
       <p>
@@ -359,7 +360,7 @@
             relative to the base directory.
           </li>
         </ul>
-        <!--note>Cocoon users will need to setup the config, see FOPSerializer for more information.</note-->
+<!--note>Cocoon users will need to setup the config, see FOPSerializer for more information.</note-->
       </section>
       <section id="autodetect">
         <title>Auto-Detect and auto-embed feature</title>
@@ -425,14 +426,14 @@
         </ul>
       </section>
       <section id="substitution">
-         <title>Substitution</title>
-         <p>When a &lt;substitutions/&gt; section is defined in the configuration, FOP will re-map any font-family references found in your FO input to a given substitution font.</p>
-         <ul>
-            <li>If a &lt;substitution/&gt; is declared, it is mandatory that both a &lt;from/&gt; and &lt;to/&gt; child element is declared with a font-family attribute.</li>
-            <li>Both font-weight and font-style are optional attributes, if they are provided then a value of 'normal' is assumed.</li>
-         </ul>
-         <p>For example you could make all FO font-family references to 'Arial' with weights between 700 and 900 reference the normal 'Arial Black' font.</p>
-         <source><![CDATA[
+        <title>Substitution</title>
+        <p>When a &lt;substitutions/&gt; section is defined in the configuration, FOP will re-map any font-family references found in your FO input to a given substitution font.</p>
+        <ul>
+          <li>If a &lt;substitution/&gt; is declared, it is mandatory that both a &lt;from/&gt; and &lt;to/&gt; child element is declared with a font-family attribute.</li>
+          <li>Both font-weight and font-style are optional attributes, if they are provided then a value of 'normal' is assumed.</li>
+        </ul>
+        <p>For example you could make all FO font-family references to 'Arial' with weights between 700 and 900 reference the normal 'Arial Black' font.</p>
+        <source><![CDATA[
 <fop version="1.0">
    <fonts>
       <substitutions>
@@ -448,7 +449,7 @@
    </fonts>
 </fop>]]></source>
       </section>
-      <!-- The following section should no longer be required
+<!-- The following section should no longer be required
       <section id="embedding-base14">
         <title>Explicitly embedding the base 14 fonts</title>
         <p>
@@ -474,5 +475,18 @@
   [..]]]></source>
       </section-->
     </section>
+    <section id="selection">
+      <title>Font Selection Strategies</title>
+      <p>
+          There are two font selection strategies: character-by-character or auto. The default is auto.</p>
+      <p>Auto selected the first font from the list which is able to display the most characters in a given word. This means (assume font A has characters for abclmn, font B for lnmxyz, fontlist is A,B):</p>
+      <ul>
+        <li>aaa lll xxx would be displayed in fonts A A B</li>
+        <li>aaaxx would be displayed in font A</li>
+        <li>aaaxxx would be displayed in font A</li>
+        <li>aaaxxxx would be displayed in font B</li>
+      </ul>
+      <p>Character-by-Character is NOT yet supported!</p>
+    </section>
   </body>
 </document>

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/content/xdocs/trunk/output.xml Mon Jul  7 07:09:01 2008
@@ -422,6 +422,31 @@
           Consult the technical reference for your printer for all available values.
         </p>
       </section>
+      <section id="pcl-duplex-mode">
+        <title>Page Duplex Mode</title>
+        <p>
+          The duplex-mode extension attribute on fo:simple-page-master allows to 
+          select the duplex mode to be used for a particular simple-page-master.
+          Example:
+        </p>
+      <source><![CDATA[
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" pcl:duplex-mode="0">
+          ...
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+]]></source>
+        <p>
+          Note: the duplex is a positive integer and the value depends on
+          the target printer. Not all PCL printers support duplexing.
+          Usually, 
+          "0" is simplex,
+          "1" is duplex (long-edge binding), 
+          "2" is duplex (short-edge binding).
+
+          Consult the technical reference for your printer for all available values.
+        </p>
+      </section>
     </section>
   </section>
   <section id="afp">

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/skinconf.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/skinconf.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/documentation/skinconf.xml Mon Jul  7 07:09:01 2008
@@ -369,6 +369,7 @@
       <width>88</width>
       <height>31</height>
     </credit>
+    <!--
     <credit box-location="alt2">
       <name>ApacheCon Europe 2008</name>
       <url>http://eu.apachecon.com/</url>
@@ -376,6 +377,7 @@
       <width>125</width>
       <height>125</height>
     </credit>
+    -->
     <credit box-location="alt2">
       <name>ApacheCon US 2008</name>
       <url>http://us.apachecon.com/</url>

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/MimeConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/MimeConstants.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/MimeConstants.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/apps/MimeConstants.java Mon Jul  7 07:09:01 2008
@@ -55,7 +55,7 @@
     /** FrameMaker's MIF */
     String MIME_MIF             = "application/mif";
     
-    /** Structured Vector Graphics */
+    /** Scalable Vector Graphics */
     String MIME_SVG             = "image/svg+xml";
     
     /** GIF images */

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/Area.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/Area.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/Area.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/Area.java Mon Jul  7 07:09:01 2008
@@ -418,13 +418,8 @@
      * @param oTraitCode the trait key
      * @return the trait value
      */
-    public boolean getBooleanTrait(Object oTraitCode) {
-        final Object obj = getTrait(oTraitCode);
-        if (obj instanceof Boolean) {
-            return ((Boolean)obj).booleanValue();
-        } else {
-            return false;
-        }
+    public boolean getTraitAsBoolean(Object oTraitCode) {
+        return Boolean.TRUE.equals(getTrait(oTraitCode));
     }
 
     /**

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/AreaTreeParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/AreaTreeParser.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/AreaTreeParser.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/AreaTreeParser.java Mon Jul  7 07:09:01 2008
@@ -26,6 +26,7 @@
 import java.util.Set;
 import java.util.Stack;
 import java.util.StringTokenizer;
+import java.nio.CharBuffer;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -56,7 +57,6 @@
 import org.apache.fop.area.Trait.Background;
 import org.apache.fop.area.Trait.InternalLink;
 import org.apache.fop.area.inline.AbstractTextArea;
-import org.apache.fop.area.inline.Character;
 import org.apache.fop.area.inline.ForeignObject;
 import org.apache.fop.area.inline.Image;
 import org.apache.fop.area.inline.InlineArea;
@@ -78,6 +78,7 @@
 import org.apache.fop.util.ColorUtil;
 import org.apache.fop.util.ContentHandlerFactory;
 import org.apache.fop.util.ContentHandlerFactoryRegistry;
+import org.apache.fop.util.ConversionUtils;
 import org.apache.fop.util.DefaultErrorListener;
 
 /**
@@ -132,8 +133,10 @@
         private ElementMappingRegistry elementMappingRegistry;
 
         private Attributes lastAttributes;
-        private StringBuffer content = new StringBuffer();
 
+        private CharBuffer content = CharBuffer.allocate(64);
+        private boolean ignoreCharacters = true;
+        
         private PageViewport currentPageViewport;
         private Map pageViewportsByKey = new java.util.HashMap();
         // set of "ID firsts" that have already been assigned to a PV:
@@ -176,7 +179,6 @@
             makers.put("text", new TextMaker());
             makers.put("word", new WordMaker());
             makers.put("space", new SpaceMaker());
-            makers.put("char", new CharMaker());
             makers.put("leader", new LeaderMaker());
             makers.put("viewport", new ViewportMaker());
             makers.put("image", new ImageMaker());
@@ -186,15 +188,6 @@
             makers.put("destination", new DestinationMaker());
         }
 
-        private static Rectangle2D parseRect(String rect) {
-            StringTokenizer tokenizer = new StringTokenizer(rect, " ");
-            return new Rectangle2D.Double(
-                    Double.parseDouble(tokenizer.nextToken()),
-                    Double.parseDouble(tokenizer.nextToken()),
-                    Double.parseDouble(tokenizer.nextToken()),
-                    Double.parseDouble(tokenizer.nextToken()));
-        }
-
         private Area findAreaType(Class clazz) {
             if (areaStack.size() > 0) {
                 int pos = areaStack.size() - 1;
@@ -261,7 +254,10 @@
                 boolean handled = true;
                 if ("".equals(uri)) {
                     Maker maker = (Maker)makers.get(localName);
+                    content.clear();
+                    ignoreCharacters = true;
                     if (maker != null) {
+                        ignoreCharacters = maker.ignoreCharacters();
                         maker.startElement(attributes);
                     } else if ("extension-attachments".equals(localName)) {
                         //TODO implement me
@@ -311,11 +307,12 @@
                     Maker maker = (Maker)makers.get(localName);
                     if (maker != null) {
                         maker.endElement();
+                        content.clear();
                     }
+                    ignoreCharacters = true;
                 } else {
                     //log.debug("Ignoring " + localName + " in namespace: " + uri);
                 }
-                content.setLength(0); //Reset text buffer (see characters())
             }
         }
 
@@ -324,6 +321,7 @@
         private static interface Maker {
             void startElement(Attributes attributes) throws SAXException;
             void endElement();
+            boolean ignoreCharacters();
         }
 
         private abstract class AbstractMaker implements Maker {
@@ -335,6 +333,10 @@
             public void endElement() {
                 //nop
             }
+            
+            public boolean ignoreCharacters() {
+                return true;
+            }
         }
 
         private class AreaTreeMaker extends AbstractMaker {
@@ -384,7 +386,7 @@
                 if (currentPageViewport != null) {
                     throw new IllegalStateException("currentPageViewport must be null");
                 }
-                Rectangle2D viewArea = parseRect(attributes.getValue("bounds"));
+                Rectangle2D viewArea = getAttributeAsRectangle2D(attributes, "bounds");
                 int pageNumber = getAttributeAsInteger(attributes, "nr", -1);
                 String key = attributes.getValue("key");
                 String pageNumberString = attributes.getValue("formatted-nr");
@@ -420,7 +422,7 @@
                 if (rv != null) {
                     throw new IllegalStateException("Current RegionViewport must be null");
                 }
-                Rectangle2D viewArea = parseRect(attributes.getValue("rect"));
+                Rectangle2D viewArea = getAttributeAsRectangle2D(attributes, "rect");
                 rv = new RegionViewport(viewArea);
                 transferForeignObjects(attributes, rv);
                 rv.setClip(getAttributeAsBoolean(attributes, "clipped", false));
@@ -444,7 +446,7 @@
             
             public void endElement() {
                 assertObjectOfClass(areaStack.pop(), RegionReference.class);
-            }            
+            }
         }
 
         private class RegionAfterMaker extends AbstractMaker {
@@ -455,7 +457,7 @@
 
             public void endElement() {
                 assertObjectOfClass(areaStack.pop(), RegionReference.class);
-            }            
+            }
         }
 
         private class RegionStartMaker extends AbstractMaker {
@@ -466,7 +468,7 @@
 
             public void endElement() {
                 assertObjectOfClass(areaStack.pop(), RegionReference.class);
-            }            
+            }
         }
         
         private class RegionEndMaker extends AbstractMaker {
@@ -477,7 +479,7 @@
 
             public void endElement() {
                 assertObjectOfClass(areaStack.pop(), RegionReference.class);
-            }            
+            }
         }
 
         private class RegionBodyMaker extends AbstractMaker {
@@ -575,7 +577,7 @@
             
             public void endElement() {
                 assertObjectOfClass(areaStack.pop(), BeforeFloat.class);
-            }            
+            }
         }
 
         private class BlockMaker extends AbstractMaker {
@@ -627,7 +629,7 @@
             
             public void endElement() {
                 assertObjectOfClass(areaStack.pop(), Block.class);
-            }            
+            }
         }
 
         private class LineAreaMaker extends AbstractMaker {
@@ -735,47 +737,37 @@
             
             public void endElement() {
                 assertObjectOfClass(areaStack.pop(), TextArea.class);
-            }            
+            }
         }
 
         private class WordMaker extends AbstractMaker {
 
-            private int[] toIntArray(String s) {
-                if (s == null || s.length() == 0) {
-                    return null;
-                }
-                StringTokenizer tokenizer = new StringTokenizer(s, " ");
-                List values = new java.util.ArrayList();
-                while (tokenizer.hasMoreTokens()) {
-                    values.add(new Integer(tokenizer.nextToken()));
-                }
-                int[] res = new int[values.size()];
-                for (int i = 0, c = res.length; i < c; i++) {
-                    res[i] = ((Integer)values.get(i)).intValue();
-                }
-                return res;
-            }
-            
             public void endElement() {
                 int offset = getAttributeAsInteger(lastAttributes, "offset", 0);
-                int[] letterAdjust = toIntArray(lastAttributes.getValue("letter-adjust"));
-                String txt = content.toString();
-                WordArea word = new WordArea(txt, offset, letterAdjust);
+                int[] letterAdjust 
+                        = ConversionUtils.toIntArray(
+                            lastAttributes.getValue("letter-adjust"), "\\s");
+                content.flip();
+                WordArea word = new WordArea(content.toString().trim(), offset, letterAdjust);
                 AbstractTextArea text = getCurrentText();
                 word.setParentArea(text);
                 text.addChildArea(word);
-            }            
+            }
+            
+            public boolean ignoreCharacters() {
+                return false;
+            }
         }
 
         private class SpaceMaker extends AbstractMaker {
-
+            
             public void endElement() {
                 int offset = getAttributeAsInteger(lastAttributes, "offset", 0);
-                String txt = content.toString();
                 //TODO the isAdjustable parameter is currently not used/implemented
-                if (txt.length() > 0) {
+                if (content.position() > 0) {
+                    content.flip();
                     boolean adjustable = getAttributeAsBoolean(lastAttributes, "adj", true);
-                    SpaceArea space = new SpaceArea(txt.charAt(0), offset, adjustable);
+                    SpaceArea space = new SpaceArea(content.charAt(0), offset, adjustable);
                     AbstractTextArea text = getCurrentText();
                     space.setParentArea(text);
                     text.addChildArea(space);
@@ -789,25 +781,11 @@
                     Area parent = (Area)areaStack.peek();
                     parent.addChildArea(space);
                 }
-            }            
-        }
-
-        private class CharMaker extends AbstractMaker {
-
-            public void endElement() {
-                String txt = content.toString();
-                Character ch = new Character(txt.charAt(0));
-                transferForeignObjects(lastAttributes, ch);
-                setAreaAttributes(lastAttributes, ch);
-                setTraits(lastAttributes, ch, SUBSET_COMMON);
-                setTraits(lastAttributes, ch, SUBSET_BOX);
-                setTraits(lastAttributes, ch, SUBSET_COLOR);
-                setTraits(lastAttributes, ch, SUBSET_FONT);
-                ch.setOffset(getAttributeAsInteger(lastAttributes, "offset", 0));
-                ch.setBaselineOffset(getAttributeAsInteger(lastAttributes, "baseline", 0));
-                Area parent = (Area)areaStack.peek();
-                parent.addChildArea(ch);
-            }            
+            }
+            
+            public boolean ignoreCharacters() {
+                return false;
+            }
         }
 
         private class LeaderMaker extends AbstractMaker {
@@ -830,9 +808,6 @@
                 Area parent = (Area)areaStack.peek();
                 parent.addChildArea(leader);
             }
-            
-            public void endElement() {
-            }            
         }
 
         private class ViewportMaker extends AbstractMaker {
@@ -854,7 +829,7 @@
             
             public void endElement() {
                 assertObjectOfClass(areaStack.pop(), Viewport.class);
-            }            
+            }
         }
         
         private class ImageMaker extends AbstractMaker {
@@ -1097,7 +1072,7 @@
             }
         }
 
-        private boolean getAttributeAsBoolean(Attributes attributes, String name,
+        private static boolean getAttributeAsBoolean(Attributes attributes, String name,
                 boolean defaultValue) {
             String s = attributes.getValue(name);
             if (s == null) {
@@ -1107,7 +1082,7 @@
             }
         }
 
-        private int getAttributeAsInteger(Attributes attributes, String name, 
+        private static int getAttributeAsInteger(Attributes attributes, String name, 
                 int defaultValue) {
             String s = attributes.getValue(name);
             if (s == null) {
@@ -1117,36 +1092,30 @@
             }
         }
 
-        private CTM getAttributeAsCTM(Attributes attributes, String name) {
+        private static CTM getAttributeAsCTM(Attributes attributes, String name) {
             String s = attributes.getValue(name).trim();
             if (s.startsWith("[") && s.endsWith("]")) {
                 s = s.substring(1, s.length() - 1);
-                StringTokenizer tokenizer = new StringTokenizer(s, " ");
-                double[] values = new double[] {
-                        Double.parseDouble(tokenizer.nextToken()),
-                        Double.parseDouble(tokenizer.nextToken()),
-                        Double.parseDouble(tokenizer.nextToken()),
-                        Double.parseDouble(tokenizer.nextToken()),
-                        Double.parseDouble(tokenizer.nextToken()),
-                        Double.parseDouble(tokenizer.nextToken())};
+                double[] values = ConversionUtils.toDoubleArray(s, "\\s");
+                if (values.length != 6) {
+                    throw new IllegalArgumentException("CTM must consist of 6 double values!");
+                }
                 return new CTM(values[0], values[1], values[2], values[3], values[4], values[5]);
             } else {
-                throw new IllegalArgumentException("CTM must be surrounded by square brackets");
+                throw new IllegalArgumentException("CTM must be surrounded by square brackets!");
             }
         }
 
-        private Rectangle2D getAttributeAsRectangle2D(Attributes attributes, String name) {
+        private static Rectangle2D getAttributeAsRectangle2D(Attributes attributes, String name) {
             String s = attributes.getValue(name).trim();
-            StringTokenizer tokenizer = new StringTokenizer(s, " ");
-            double[] values = new double[] {
-                    Double.parseDouble(tokenizer.nextToken()),
-                    Double.parseDouble(tokenizer.nextToken()),
-                    Double.parseDouble(tokenizer.nextToken()),
-                    Double.parseDouble(tokenizer.nextToken())};
+            double[] values = ConversionUtils.toDoubleArray(s, "\\s");
+            if (values.length != 4) {
+                throw new IllegalArgumentException("Rectangle must consist of 4 double values!");
+            }
             return new Rectangle2D.Double(values[0], values[1], values[2], values[3]);
         }
 
-        private void transferForeignObjects(Attributes atts, AreaTreeObject ato) {
+        private static void transferForeignObjects(Attributes atts, AreaTreeObject ato) {
             for (int i = 0, c = atts.getLength(); i < c; i++) {
                 String ns = atts.getURI(i);
                 if (ns.length() > 0) {
@@ -1163,11 +1132,25 @@
         public void characters(char[] ch, int start, int length) throws SAXException {
             if (delegate != null) {
                 delegate.characters(ch, start, length);
-            } else {
-                content.append(ch, start, length);
+            } else if (!ignoreCharacters) {
+                int maxLength = this.content.capacity() - this.content.position();
+                if (maxLength < length) {
+                    // allocate a larger buffer and transfer content
+                    CharBuffer newContent 
+                            = CharBuffer.allocate(this.content.position() + length);
+                    this.content.flip();
+                    newContent.put(this.content);
+                    this.content = newContent;
+                }
+                // make sure the full capacity is used
+                this.content.limit(this.content.capacity());
+                // add characters to the buffer
+                this.content.put(ch, start, length);
+                // decrease the limit, if necessary
+                if (this.content.position() < this.content.limit()) {
+                    this.content.limit(this.content.position());
+                }
             }
         }
-
     }
-
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/Page.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/Page.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/Page.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/Page.java Mon Jul  7 07:09:01 2008
@@ -126,6 +126,10 @@
             } else {
                 rr = new RegionReference(r, rvp);
             }
+            // set borders and padding traits
+            // (a little extensions wrt what prescribed by the specs at 6.4.14)
+            TraitSetter.addBorders(rr, r.getCommonBorderPaddingBackground(), false, false, false, false, null);
+            TraitSetter.addPadding(rr, r.getCommonBorderPaddingBackground(), false, false, false, false, null);
             setRegionReferencePosition(rr, r, rvp.getViewArea());
             rvp.setRegionReference(rr);
             setRegionViewport(r.getNameId(), rvp);
@@ -205,27 +209,28 @@
     /**
      * Get the region from this page.
      *
-     * @param areaclass the region area class
+     * @param areaClass the region area class
      * @return the region viewport or null if none
      */
-    public RegionViewport getRegionViewport(int areaclass) {
-        if (areaclass == Constants.FO_REGION_BEFORE) {
+    public RegionViewport getRegionViewport(int areaClass) {
+        switch (areaClass) {
+        case Constants.FO_REGION_BEFORE:
             return regionBefore;
-        } else if (areaclass == Constants.FO_REGION_START) {
+        case Constants.FO_REGION_START:
             return regionStart;
-        } else if (areaclass == Constants.FO_REGION_BODY) {
-            return regionBody;
-        } else if (areaclass == Constants.FO_REGION_END) {
+        case Constants.FO_REGION_BODY:
+            return regionBody;            
+        case Constants.FO_REGION_END:
             return regionEnd;
-        } else if (areaclass == Constants.FO_REGION_AFTER) {
+        case Constants.FO_REGION_AFTER:
             return regionAfter;
+        default:
+            throw new IllegalArgumentException("No such area class with ID = " + areaClass);
         }
-        throw new IllegalArgumentException("No such area class with ID = "
-            + areaclass);
     }
 
     /**
-     * indicates whether any FOs have been added to the body region
+     * Indicates whether any FOs have been added to the body region
      *
      * @return whether any FOs have been added to the body region
      */
@@ -289,3 +294,4 @@
 
 }
 
+

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/RegionReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/RegionReference.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/RegionReference.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/RegionReference.java Mon Jul  7 07:09:01 2008
@@ -73,6 +73,18 @@
         blocks.add(child);
     }
 
+    /** {@inheritDoc} */
+    public int getBPD() {
+        // subtract bpd of borders and padding before / after
+        return super.getBPD() - getBorderAndPaddingWidthBefore() - getBorderAndPaddingWidthAfter();
+    }
+    
+    /** {@inheritDoc} */
+    public int getIPD() {
+        // subtract ipd of borders and padding start / end
+        return super.getIPD() - getBorderAndPaddingWidthStart() - getBorderAndPaddingWidthEnd();
+    }
+
     /**
      * Set the Coordinate Transformation Matrix which transforms content
      * coordinates in this region reference area which are specified in
@@ -133,7 +145,7 @@
     public void addBlock(Block block) {
         addChildArea(block);
     }
-
+    
     /**
      * Clone this region.
      * This is used when cloning the page by the page master.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineArea.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineArea.java Mon Jul  7 07:09:01 2008
@@ -182,22 +182,22 @@
      *@return true if the inline area is underlined.
      */
     public boolean hasUnderline() {
-        return getBooleanTrait(Trait.UNDERLINE);
+        return getTraitAsBoolean(Trait.UNDERLINE);
     }
 
     /** @return true if the inline area is overlined. */
     public boolean hasOverline() {
-        return getBooleanTrait(Trait.OVERLINE);
+        return getTraitAsBoolean(Trait.OVERLINE);
     }
     
     /** @return true if the inline area has a line through. */
     public boolean hasLineThrough() {
-        return getBooleanTrait(Trait.LINETHROUGH);
+        return getTraitAsBoolean(Trait.LINETHROUGH);
     }
     
     /** @return true if the inline area is blinking. */
     public boolean isBlinking() {
-        return getBooleanTrait(Trait.BLINK);
+        return getTraitAsBoolean(Trait.BLINK);
     }
     
     /**

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventExceptionManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventExceptionManager.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventExceptionManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventExceptionManager.java Mon Jul  7 07:09:01 2008
@@ -25,7 +25,7 @@
 import org.apache.xmlgraphics.util.Service;
 
 /**
- * This class is reponsible for converting events into exceptions.
+ * This class is responsible for converting events into exceptions.
  */
 public class EventExceptionManager {
 

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.xml?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.xml Mon Jul  7 07:09:01 2008
@@ -65,6 +65,7 @@
   <message key="org.apache.fop.fo.flow.table.TableEventProducer.warnImplicitColumns">table-layout=\"fixed\" and column-width unspecified =&gt; falling back to proportional-column-width(1){{locator}}</message>
   <message key="org.apache.fop.fo.flow.table.TableEventProducer.paddingNotApplicable">padding-* properties are not applicable to {elementName}, but a non-zero value for padding was found.{{locator}}</message>
   <message key="org.apache.fop.fo.flow.table.TableEventProducer.cellOverlap">{elementName} overlaps in column {column}.<!-- no locator here, exception will be wrapped --></message>
+  <message key="org.apache.fop.fo.flow.table.TableEventProducer.forceNextColumnNumber">Negative value {propValue} of property column-number of element {elementName} forced into the next available column number {columnNumber}.{{locator}}</message>
   <message key="org.apache.fop.fo.flow.table.TableEventProducer.breakIgnoredDueToRowSpanning">{breakBefore,if,break-before,break-after} ignored on {elementName} because of row spanning in progress (See XSL 1.1, {breakBefore,if,7.20.2,7.20.1}){{locator}}</message>
   <message key="org.apache.fop.events.ResourceEventProducer.imageNotFound">Image not found.[ URI: {uri}.]{{locator}}</message>
   <message key="org.apache.fop.events.ResourceEventProducer.imageError">Image not available.[ URI: {uri}.] Reason:[ {reason}][ {e}]{{locator}}</message>

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventListener.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventListener.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventListener.java Mon Jul  7 07:09:01 2008
@@ -28,7 +28,7 @@
      * This method is called for each event that is generated. With the event's ID it is possible
      * to react to certain events. Events can also simply be recorded and presented to a user.
      * It is possible to throw an (unchecked) exception if the processing needs to be aborted
-     * because some special event occured. This way the client can configure the behaviour of
+     * because some special event occurred. This way the client can configure the behaviour of
      * the observed application.
      * @param event the event
      */

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/Constants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/Constants.java?rev=674497&r1=674496&r2=674497&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/Constants.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/Constants.java Mon Jul  7 07:09:01 2008
@@ -24,9 +24,9 @@
  * There are sets of constants describing:
  * <ul>
  * <li>Input and output formats</li>
- * <li>Formatting objects</li>
- * <li>Formatting properties</li>
- * <li>Enumerated values used in formatting properties</li>
+ * <li>Formatting objects (<em>FO_XXX</em>)</li>
+ * <li>Formatting properties (<em>PR_XXX</em>)</li>
+ * <li>Enumerated values used in formatting properties (<em>EN_XXX</em>)</li>
  * </ul>
  */
 public interface Constants {
@@ -45,124 +45,162 @@
     int FO_BLOCK = 3;
     /** FO element constant */
     int FO_BLOCK_CONTAINER = 4;
+    /** FO element constant - XSL 1.1 */
+    int FO_BOOKMARK_TREE = 5;
+    /** FO element constant - XSL 1.1 */
+    int FO_BOOKMARK = 6;
+    /** FO element constant - XSL 1.1 */
+    int FO_BOOKMARK_TITLE = 7;
+    /** FO element constant - XSL 1.1 */
+    int FO_CHANGE_BAR_BEGIN = 8;
+    /** FO element constant - XSL 1.1 */
+    int FO_CHANGE_BAR_END = 9;
     /** FO element constant */
-    int FO_CHARACTER = 5;
+    int FO_CHARACTER = 10;
     /** FO element constant */
-    int FO_COLOR_PROFILE = 6;
+    int FO_COLOR_PROFILE = 11;
     /** FO element constant */
-    int FO_CONDITIONAL_PAGE_MASTER_REFERENCE = 7;
+    int FO_CONDITIONAL_PAGE_MASTER_REFERENCE = 12;
     /** FO element constant */
-    int FO_DECLARATIONS = 8;
+    int FO_DECLARATIONS = 13;
     /** FO element constant */
-    int FO_EXTERNAL_GRAPHIC = 9;
+    int FO_EXTERNAL_GRAPHIC = 14;
     /** FO element constant */
-    int FO_FLOAT = 10;
+    int FO_FLOAT = 15;
     /** FO element constant */
-    int FO_FLOW = 11;
+    int FO_FLOW = 16;
+    /** FO element constant - XSL 1.1 */
+    int FO_FLOW_ASSIGNMENT = 17;
+    /** FO element constant - XSL 1.1 */
+    int FO_FLOW_MAP = 18;
+    /** FO element constant - XSL 1.1 */
+    int FO_FLOW_NAME_SPECIFIER = 19;
+    /** FO element constant - XSL 1.1 */
+    int FO_FLOW_SOURCE_LIST = 20;
+    /** FO element constant - XSL 1.1 */
+    int FO_FLOW_TARGET_LIST = 21;
+    /** FO element constant - XSL 1.1 */
+    int FO_FOLIO_PREFIX = 22;
+    /** FO element constant - XSL 1.1 */
+    int FO_FOLIO_SUFFIX = 23;
     /** FO element constant */
-    int FO_FOOTNOTE = 12;
+    int FO_FOOTNOTE = 24;
     /** FO element constant */
-    int FO_FOOTNOTE_BODY = 13;
+    int FO_FOOTNOTE_BODY = 25;
+    /** FO element constant - XSL 1.1 */
+    int FO_INDEX_KEY_REFERENCE = 26;
+    /** FO element constant - XSL 1.1 */
+    int FO_INDEX_PAGE_NUMBER_PREFIX = 27;
+    /** FO element constant - XSL 1.1 */
+    int FO_INDEX_PAGE_NUMBER_SUFFIX = 28;
+    /** FO element constant - XSL 1.1 */
+    int FO_INDEX_PAGE_CITATION_LIST = 29;
+    /** FO element constant - XSL 1.1 */
+    int FO_INDEX_PAGE_CITATION_LIST_SEPARATOR = 30;
+    /** FO element constant - XSL 1.1 */
+    int FO_INDEX_PAGE_CITATION_RANGE_SEPARATOR = 31;
+    /** FO element constant - XSL 1.1 */
+    int FO_INDEX_RANGE_BEGIN = 32;
+    /** FO element constant - XSL 1.1 */
+    int FO_INDEX_RANGE_END = 33;
     /** FO element constant */
-    int FO_INITIAL_PROPERTY_SET = 14;
+    int FO_INITIAL_PROPERTY_SET = 34;
     /** FO element constant */
-    int FO_INLINE = 15;
+    int FO_INLINE = 35;
     /** FO element constant */
-    int FO_INLINE_CONTAINER = 16;
+    int FO_INLINE_CONTAINER = 36;
     /** FO element constant */
-    int FO_INSTREAM_FOREIGN_OBJECT = 17;
+    int FO_INSTREAM_FOREIGN_OBJECT = 37;
     /** FO element constant */
-    int FO_LAYOUT_MASTER_SET = 18;
+    int FO_LAYOUT_MASTER_SET = 38;
     /** FO element constant */
-    int FO_LEADER = 19;
+    int FO_LEADER = 39;
     /** FO element constant */
-    int FO_LIST_BLOCK = 20;
+    int FO_LIST_BLOCK = 40;
     /** FO element constant */
-    int FO_LIST_ITEM = 21;
+    int FO_LIST_ITEM = 41;
     /** FO element constant */
-    int FO_LIST_ITEM_BODY = 22;
+    int FO_LIST_ITEM_BODY = 42;
     /** FO element constant */
-    int FO_LIST_ITEM_LABEL = 23;
+    int FO_LIST_ITEM_LABEL = 43;
     /** FO element constant */
-    int FO_MARKER = 24;
+    int FO_MARKER = 44;
     /** FO element constant */
-    int FO_MULTI_CASE = 25;
+    int FO_MULTI_CASE = 45;
     /** FO element constant */
-    int FO_MULTI_PROPERTIES = 26;
+    int FO_MULTI_PROPERTIES = 46;
     /** FO element constant */
-    int FO_MULTI_PROPERTY_SET = 27;
+    int FO_MULTI_PROPERTY_SET = 47;
     /** FO element constant */
-    int FO_MULTI_SWITCH = 28;
+    int FO_MULTI_SWITCH = 48;
     /** FO element constant */
-    int FO_MULTI_TOGGLE = 29;
+    int FO_MULTI_TOGGLE = 49;
     /** FO element constant */
-    int FO_PAGE_NUMBER = 30;
+    int FO_PAGE_NUMBER = 50;
     /** FO element constant */
-    int FO_PAGE_NUMBER_CITATION = 31;
+    int FO_PAGE_NUMBER_CITATION = 51;
+    /** FO element constant - XSL 1.1 */
+    int FO_PAGE_NUMBER_CITATION_LAST = 52;
     /** FO element constant */
-    int FO_PAGE_SEQUENCE = 32;
+    int FO_PAGE_SEQUENCE = 53;
     /** FO element constant */
-    int FO_PAGE_SEQUENCE_MASTER = 33;
+    int FO_PAGE_SEQUENCE_MASTER = 54;
+    /** FO element constant - XSL 1.1 */
+    int FO_PAGE_SEQUENCE_WRAPPER = 55;
     /** FO element constant */
-    int FO_REGION_AFTER = 34;
+    int FO_REGION_AFTER = 56;
     /** FO element constant */
-    int FO_REGION_BEFORE = 35;
+    int FO_REGION_BEFORE = 57;
     /** FO element constant */
-    int FO_REGION_BODY = 36;
+    int FO_REGION_BODY = 58;
     /** FO element constant */
-    int FO_REGION_END = 37;
+    int FO_REGION_END = 59;
+    /** FO element constant - XSL 1.1 */
+    int FO_REGION_NAME_SPECIFIER = 60;
     /** FO element constant */
-    int FO_REGION_START = 38;
+    int FO_REGION_START = 61;
     /** FO element constant */
-    int FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES = 39;
+    int FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES = 62;
     /** FO element constant */
-    int FO_REPEATABLE_PAGE_MASTER_REFERENCE = 40;
+    int FO_REPEATABLE_PAGE_MASTER_REFERENCE = 63;
     /** FO element constant */
-    int FO_RETRIEVE_MARKER = 41;
+    int FO_RETRIEVE_MARKER = 64;
+    /** FO element constant - XSL 1.1 */
+    int FO_RETRIEVE_TABLE_MARKER = 65;
     /** FO element constant */
-    int FO_ROOT = 42;
+    int FO_ROOT = 66;
+    /** FO element constant - XSL 1.1 */
+    int FO_SCALING_VALUE_CITATION = 67;    
     /** FO element constant */
-    int FO_SIMPLE_PAGE_MASTER = 43;
+    int FO_SIMPLE_PAGE_MASTER = 68;
     /** FO element constant */
-    int FO_SINGLE_PAGE_MASTER_REFERENCE = 44;
+    int FO_SINGLE_PAGE_MASTER_REFERENCE = 69;
     /** FO element constant */
-    int FO_STATIC_CONTENT = 45;
+    int FO_STATIC_CONTENT = 70;
     /** FO element constant */
-    int FO_TABLE = 46;
+    int FO_TABLE = 71;
     /** FO element constant */
-    int FO_TABLE_AND_CAPTION = 47;
+    int FO_TABLE_AND_CAPTION = 72;
     /** FO element constant */
-    int FO_TABLE_BODY = 48;
+    int FO_TABLE_BODY = 73;
     /** FO element constant */
-    int FO_TABLE_CAPTION = 49;
+    int FO_TABLE_CAPTION = 74;
     /** FO element constant */
-    int FO_TABLE_CELL = 50;
+    int FO_TABLE_CELL = 75;
     /** FO element constant */
-    int FO_TABLE_COLUMN = 51;
+    int FO_TABLE_COLUMN = 76;
     /** FO element constant */
-    int FO_TABLE_FOOTER = 52;
+    int FO_TABLE_FOOTER = 77;
     /** FO element constant */
-    int FO_TABLE_HEADER = 53;
+    int FO_TABLE_HEADER = 78;
     /** FO element constant */
-    int FO_TABLE_ROW = 54;
+    int FO_TABLE_ROW = 79;
     /** FO element constant */
-    int FO_TITLE = 55;
+    int FO_TITLE = 80;
     /** FO element constant */
-    int FO_WRAPPER = 56;
-    /** FO element constant - XSL 1.1 */
-    int FO_BOOKMARK_TREE = 57;
-    /** FO element constant - XSL 1.1 */
-    int FO_BOOKMARK = 58;
-    /** FO element constant - XSL 1.1 */
-    int FO_BOOKMARK_TITLE = 59;
-    /** FO element constant - XSL 1.1 */
-    int FO_PAGE_SEQUENCE_WRAPPER = 60;
-    /** FO element constant - XSL 1.1 */
-    int FO_PAGE_NUMBER_CITATION_LAST = 61;
-    /** FO element constant - XSL 1.1 */
-    int FO_RETRIEVE_TABLE_MARKER = 62;
+    int FO_WRAPPER = 81;
     /** Number of FO element constants defined */
-    int FRM_OBJ_COUNT = 62;
+    int FRM_OBJ_COUNT = 81;
 
     // Masks
     /**
@@ -308,394 +346,428 @@
     int PR_CASE_NAME = 61;
     /** Property constant */
     int PR_CASE_TITLE = 62;
+    /** Property constant - XSL 1.1 */
+    int PR_CHANGE_BAR_CLASS = 63;
+    /** Property constant - XSL 1.1 */
+    int PR_CHANGE_BAR_COLOR = 64;
+    /** Property constant - XSL 1.1 */
+    int PR_CHANGE_BAR_OFFSET = 65;
+    /** Property constant - XSL 1.1 */
+    int PR_CHANGE_BAR_PLACEMENT = 66;
+    /** Property constant - XSL 1.1 */
+    int PR_CHANGE_BAR_STYLE = 67;
+    /** Property constant - XSL 1.1 */
+    int PR_CHANGE_BAR_WIDTH = 68;
     /** Property constant */
-    int PR_CHARACTER = 63;
+    int PR_CHARACTER = 69;
     /** Property constant */
-    int PR_CLEAR = 64;
+    int PR_CLEAR = 70;
     /** Property constant */
-    int PR_CLIP = 65;
+    int PR_CLIP = 71;
     /** Property constant */
-    int PR_COLOR = 66;
+    int PR_COLOR = 72;
     /** Property constant */
-    int PR_COLOR_PROFILE_NAME = 67;
+    int PR_COLOR_PROFILE_NAME = 73;
     /** Property constant */
-    int PR_COLUMN_COUNT = 68;
+    int PR_COLUMN_COUNT = 74;
     /** Property constant */
-    int PR_COLUMN_GAP = 69;
+    int PR_COLUMN_GAP = 75;
     /** Property constant */
-    int PR_COLUMN_NUMBER = 70;
+    int PR_COLUMN_NUMBER = 76;
     /** Property constant */
-    int PR_COLUMN_WIDTH = 71;
+    int PR_COLUMN_WIDTH = 77;
     /** Property constant */
-    int PR_CONTENT_HEIGHT = 72;
+    int PR_CONTENT_HEIGHT = 78;
     /** Property constant */
-    int PR_CONTENT_TYPE = 73;
+    int PR_CONTENT_TYPE = 79;
     /** Property constant */
-    int PR_CONTENT_WIDTH = 74;
+    int PR_CONTENT_WIDTH = 80;
     /** Property constant */
-    int PR_COUNTRY = 75;
+    int PR_COUNTRY = 81;
     /** Property constant */
-    int PR_CUE = 76;
+    int PR_CUE = 82;
     /** Property constant */
-    int PR_CUE_AFTER = 77;
+    int PR_CUE_AFTER = 83;
     /** Property constant */
-    int PR_CUE_BEFORE = 78;
+    int PR_CUE_BEFORE = 84;
     /** Property constant */
-    int PR_DESTINATION_PLACEMENT_OFFSET = 79;
+    int PR_DESTINATION_PLACEMENT_OFFSET = 85;
     /** Property constant */
-    int PR_DIRECTION = 80;
+    int PR_DIRECTION = 86;
     /** Property constant */
-    int PR_DISPLAY_ALIGN = 81;
+    int PR_DISPLAY_ALIGN = 87;
     /** Property constant */
-    int PR_DOMINANT_BASELINE = 82;
+    int PR_DOMINANT_BASELINE = 88;
     /** Property constant */
-    int PR_ELEVATION = 83;
+    int PR_ELEVATION = 89;
     /** Property constant */
-    int PR_EMPTY_CELLS = 84;
+    int PR_EMPTY_CELLS = 90;
     /** Property constant */
-    int PR_END_INDENT = 85;
+    int PR_END_INDENT = 91;
     /** Property constant */
-    int PR_ENDS_ROW = 86;
+    int PR_ENDS_ROW = 92;
     /** Property constant */
-    int PR_EXTENT = 87;
+    int PR_EXTENT = 93;
     /** Property constant */
-    int PR_EXTERNAL_DESTINATION = 88;
+    int PR_EXTERNAL_DESTINATION = 94;
     /** Property constant */
-    int PR_FLOAT = 89;
+    int PR_FLOAT = 95;
+    /** Property constant -- XSL 1.1 */
+    int PR_FLOW_MAP_NAME = 96;
+    /** Property constant -- XSL 1.1 */
+    int PR_FLOW_MAP_REFERENCE = 97;
     /** Property constant */
-    int PR_FLOW_NAME = 90;
+    int PR_FLOW_NAME = 98;
+    /** Property constant -- XSL 1.1 */
+    int PR_FLOW_NAME_REFERENCE = 99;
     /** Property constant */
-    int PR_FONT = 91;
+    int PR_FONT = 100;
     /** Property constant */
-    int PR_FONT_FAMILY = 92;
+    int PR_FONT_FAMILY = 101;
     /** Property constant */
-    int PR_FONT_SELECTION_STRATEGY = 93;
+    int PR_FONT_SELECTION_STRATEGY = 102;
     /** Property constant */
-    int PR_FONT_SIZE = 94;
+    int PR_FONT_SIZE = 103;
     /** Property constant */
-    int PR_FONT_SIZE_ADJUST = 95;
+    int PR_FONT_SIZE_ADJUST = 104;
     /** Property constant */
-    int PR_FONT_STRETCH = 96;
+    int PR_FONT_STRETCH = 105;
     /** Property constant */
-    int PR_FONT_STYLE = 97;
+    int PR_FONT_STYLE = 106;
     /** Property constant */
-    int PR_FONT_VARIANT = 98;
+    int PR_FONT_VARIANT = 107;
     /** Property constant */
-    int PR_FONT_WEIGHT = 99;
+    int PR_FONT_WEIGHT = 108;
     /** Property constant */
-    int PR_FORCE_PAGE_COUNT = 100;
+    int PR_FORCE_PAGE_COUNT = 109;
     /** Property constant */
-    int PR_FORMAT = 101;
+    int PR_FORMAT = 110;
     /** Property constant */
-    int PR_GLYPH_ORIENTATION_HORIZONTAL = 102;
+    int PR_GLYPH_ORIENTATION_HORIZONTAL = 111;
     /** Property constant */
-    int PR_GLYPH_ORIENTATION_VERTICAL = 103;
+    int PR_GLYPH_ORIENTATION_VERTICAL = 112;
     /** Property constant */
-    int PR_GROUPING_SEPARATOR = 104;
+    int PR_GROUPING_SEPARATOR = 113;
     /** Property constant */
-    int PR_GROUPING_SIZE = 105;
+    int PR_GROUPING_SIZE = 114;
     /** Property constant */
-    int PR_HEIGHT = 106;
+    int PR_HEIGHT = 115;
     /** Property constant */
-    int PR_HYPHENATE = 107;
+    int PR_HYPHENATE = 116;
     /** Property constant */
-    int PR_HYPHENATION_CHARACTER = 108;
+    int PR_HYPHENATION_CHARACTER = 117;
     /** Property constant */
-    int PR_HYPHENATION_KEEP = 109;
+    int PR_HYPHENATION_KEEP = 118;
     /** Property constant */
-    int PR_HYPHENATION_LADDER_COUNT = 110;
+    int PR_HYPHENATION_LADDER_COUNT = 119;
     /** Property constant */
-    int PR_HYPHENATION_PUSH_CHARACTER_COUNT = 111;
+    int PR_HYPHENATION_PUSH_CHARACTER_COUNT = 120;
     /** Property constant */
-    int PR_HYPHENATION_REMAIN_CHARACTER_COUNT = 112;
+    int PR_HYPHENATION_REMAIN_CHARACTER_COUNT = 121;
     /** Property constant */
-    int PR_ID = 113;
+    int PR_ID = 122;
     /** Property constant */
-    int PR_INDICATE_DESTINATION = 114;
+    int PR_INDICATE_DESTINATION = 123;
+    /** Property constant - XSL 1.1 */
+    int PR_INDEX_CLASS = 124;
+    /** Property constant - XSL 1.1 */
+    int PR_INDEX_KEY = 125;
     /** Property constant */
-    int PR_INITIAL_PAGE_NUMBER = 115;
+    int PR_INITIAL_PAGE_NUMBER = 126;
     /** Property constant */
-    int PR_INLINE_PROGRESSION_DIMENSION = 116;
+    int PR_INLINE_PROGRESSION_DIMENSION = 127;
     /** Property constant */
-    int PR_INTERNAL_DESTINATION = 117;
+    int PR_INTERNAL_DESTINATION = 128;
+    /** Property constant - XSL 1.1 */
+    int PR_INTRINSIC_SCALE_VALUE = 129;
     /** Property constant */
-    int PR_KEEP_TOGETHER = 118;
+    int PR_INTRUSION_DISPLACE = 130;
     /** Property constant */
-    int PR_KEEP_WITH_NEXT = 119;
+    int PR_KEEP_TOGETHER = 131;
     /** Property constant */
-    int PR_KEEP_WITH_PREVIOUS = 120;
+    int PR_KEEP_WITH_NEXT = 132;
     /** Property constant */
-    int PR_LANGUAGE = 121;
+    int PR_KEEP_WITH_PREVIOUS = 133;
     /** Property constant */
-    int PR_LAST_LINE_END_INDENT = 122;
+    int PR_LANGUAGE = 134;
     /** Property constant */
-    int PR_LEADER_ALIGNMENT = 123;
+    int PR_LAST_LINE_END_INDENT = 135;
     /** Property constant */
-    int PR_LEADER_LENGTH = 124;
+    int PR_LEADER_ALIGNMENT = 136;
     /** Property constant */
-    int PR_LEADER_PATTERN = 125;
+    int PR_LEADER_LENGTH = 137;
     /** Property constant */
-    int PR_LEADER_PATTERN_WIDTH = 126;
+    int PR_LEADER_PATTERN = 138;
     /** Property constant */
-    int PR_LEFT = 127;
+    int PR_LEADER_PATTERN_WIDTH = 139;
     /** Property constant */
-    int PR_LETTER_SPACING = 128;
+    int PR_LEFT = 140;
     /** Property constant */
-    int PR_LETTER_VALUE = 129;
+    int PR_LETTER_SPACING = 141;
     /** Property constant */
-    int PR_LINEFEED_TREATMENT = 130;
+    int PR_LETTER_VALUE = 142;
     /** Property constant */
-    int PR_LINE_HEIGHT = 131;
+    int PR_LINEFEED_TREATMENT = 143;
     /** Property constant */
-    int PR_LINE_HEIGHT_SHIFT_ADJUSTMENT = 132;
+    int PR_LINE_HEIGHT = 144;
     /** Property constant */
-    int PR_LINE_STACKING_STRATEGY = 133;
+    int PR_LINE_HEIGHT_SHIFT_ADJUSTMENT = 145;
     /** Property constant */
-    int PR_MARGIN = 134;
+    int PR_LINE_STACKING_STRATEGY = 146;
     /** Property constant */
-    int PR_MARGIN_BOTTOM = 135;
+    int PR_MARGIN = 147;
     /** Property constant */
-    int PR_MARGIN_LEFT = 136;
+    int PR_MARGIN_BOTTOM = 148;
     /** Property constant */
-    int PR_MARGIN_RIGHT = 137;
+    int PR_MARGIN_LEFT = 149;
     /** Property constant */
-    int PR_MARGIN_TOP = 138;
+    int PR_MARGIN_RIGHT = 150;
     /** Property constant */
-    int PR_MARKER_CLASS_NAME = 139;
+    int PR_MARGIN_TOP = 151;
     /** Property constant */
-    int PR_MASTER_NAME = 140;
+    int PR_MARKER_CLASS_NAME = 152;
     /** Property constant */
-    int PR_MASTER_REFERENCE = 141;
+    int PR_MASTER_NAME = 153;
     /** Property constant */
-    int PR_MAX_HEIGHT = 142;
+    int PR_MASTER_REFERENCE = 154;
     /** Property constant */
-    int PR_MAXIMUM_REPEATS = 143;
+    int PR_MAX_HEIGHT = 155;
     /** Property constant */
-    int PR_MAX_WIDTH = 144;
+    int PR_MAXIMUM_REPEATS = 156;
     /** Property constant */
-    int PR_MEDIA_USAGE = 145;
+    int PR_MAX_WIDTH = 157;
+    /** Property constant - XSL 1.1 */
+    int PR_MERGE_PAGES_ACROSS_INDEX_KEY_REFERENCES = 158;
+    /** Property constant - XSL 1.1 */
+    int PR_MERGE_RANGES_ACROSS_INDEX_KEY_REFERENCES = 159;
+    /** Property constant - XSL 1.1 */
+    int PR_MERGE_SEQUENTIAL_PAGE_NUMBERS = 160;
     /** Property constant */
-    int PR_MIN_HEIGHT = 146;
+    int PR_MEDIA_USAGE = 161;
     /** Property constant */
-    int PR_MIN_WIDTH = 147;
+    int PR_MIN_HEIGHT = 162;
     /** Property constant */
-    int PR_NUMBER_COLUMNS_REPEATED = 148;
+    int PR_MIN_WIDTH = 163;
     /** Property constant */
-    int PR_NUMBER_COLUMNS_SPANNED = 149;
+    int PR_NUMBER_COLUMNS_REPEATED = 164;
     /** Property constant */
-    int PR_NUMBER_ROWS_SPANNED = 150;
+    int PR_NUMBER_COLUMNS_SPANNED = 165;
     /** Property constant */
-    int PR_ODD_OR_EVEN = 151;
+    int PR_NUMBER_ROWS_SPANNED = 166;
     /** Property constant */
-    int PR_ORPHANS = 152;
+    int PR_ODD_OR_EVEN = 167;
     /** Property constant */
-    int PR_OVERFLOW = 153;
+    int PR_ORPHANS = 168;
     /** Property constant */
-    int PR_PADDING = 154;
+    int PR_OVERFLOW = 169;
     /** Property constant */
-    int PR_PADDING_AFTER = 155;
+    int PR_PADDING = 170;
     /** Property constant */
-    int PR_PADDING_BEFORE = 156;
+    int PR_PADDING_AFTER = 171;
     /** Property constant */
-    int PR_PADDING_BOTTOM = 157;
+    int PR_PADDING_BEFORE = 172;
     /** Property constant */
-    int PR_PADDING_END = 158;
+    int PR_PADDING_BOTTOM = 173;
     /** Property constant */
-    int PR_PADDING_LEFT = 159;
+    int PR_PADDING_END = 174;
     /** Property constant */
-    int PR_PADDING_RIGHT = 160;
+    int PR_PADDING_LEFT = 175;
     /** Property constant */
-    int PR_PADDING_START = 161;
+    int PR_PADDING_RIGHT = 176;
     /** Property constant */
-    int PR_PADDING_TOP = 162;
+    int PR_PADDING_START = 177;
     /** Property constant */
-    int PR_PAGE_BREAK_AFTER = 163;
+    int PR_PADDING_TOP = 178;
     /** Property constant */
-    int PR_PAGE_BREAK_BEFORE = 164;
+    int PR_PAGE_BREAK_AFTER = 179;
     /** Property constant */
-    int PR_PAGE_BREAK_INSIDE = 165;
+    int PR_PAGE_BREAK_BEFORE = 180;
     /** Property constant */
-    int PR_PAGE_HEIGHT = 166;
+    int PR_PAGE_BREAK_INSIDE = 181;
+    /** Property constant - XSL 1.1 */
+    int PR_PAGE_CITATION_STRATEGY = 182;
     /** Property constant */
-    int PR_PAGE_POSITION = 167;
+    int PR_PAGE_HEIGHT = 183;
+    /** Property constant - XSL 1.1 */
+    int PR_PAGE_NUMBER_TREATMENT = 184;
     /** Property constant */
-    int PR_PAGE_WIDTH = 168;
+    int PR_PAGE_POSITION = 185;
     /** Property constant */
-    int PR_PAUSE = 169;
+    int PR_PAGE_WIDTH = 186;
     /** Property constant */
-    int PR_PAUSE_AFTER = 170;
+    int PR_PAUSE = 187;
     /** Property constant */
-    int PR_PAUSE_BEFORE = 171;
+    int PR_PAUSE_AFTER = 188;
     /** Property constant */
-    int PR_PITCH = 172;
+    int PR_PAUSE_BEFORE = 189;
     /** Property constant */
-    int PR_PITCH_RANGE = 173;
+    int PR_PITCH = 190;
     /** Property constant */
-    int PR_PLAY_DURING = 174;
+    int PR_PITCH_RANGE = 191;
     /** Property constant */
-    int PR_POSITION = 175;
+    int PR_PLAY_DURING = 192;
     /** Property constant */
-    int PR_PRECEDENCE = 176;
+    int PR_POSITION = 193;
     /** Property constant */
-    int PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS = 177;
+    int PR_PRECEDENCE = 194;
     /** Property constant */
-    int PR_PROVISIONAL_LABEL_SEPARATION = 178;
+    int PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS = 195;
     /** Property constant */
-    int PR_REFERENCE_ORIENTATION = 179;
+    int PR_PROVISIONAL_LABEL_SEPARATION = 196;
     /** Property constant */
-    int PR_REF_ID = 180;
+    int PR_REFERENCE_ORIENTATION = 197;
     /** Property constant */
-    int PR_REGION_NAME = 181;
+    int PR_REF_ID = 198;
     /** Property constant */
-    int PR_RELATIVE_ALIGN = 182;
+    int PR_REGION_NAME = 199;
+    /** Property constant - XSL 1.1 */
+    int PR_REGION_NAME_REFERENCE = 200;
+    /** Property constant - XSL 1.1 */
+    int PR_REF_INDEX_KEY = 201;
     /** Property constant */
-    int PR_RELATIVE_POSITION = 183;
+    int PR_RELATIVE_ALIGN = 202;
     /** Property constant */
-    int PR_RENDERING_INTENT = 184;
+    int PR_RELATIVE_POSITION = 203;
     /** Property constant */
-    int PR_RETRIEVE_BOUNDARY = 185;
+    int PR_RENDERING_INTENT = 204;
     /** Property constant */
-    int PR_RETRIEVE_CLASS_NAME = 186;
+    int PR_RETRIEVE_BOUNDARY = 205;
+    /** Property constant - XSL 1.1 */
+    int PR_RETRIEVE_BOUNDARY_WITHIN_TABLE = 206;
     /** Property constant */
-    int PR_RETRIEVE_POSITION = 187;
+    int PR_RETRIEVE_CLASS_NAME = 207;
     /** Property constant */
-    int PR_RICHNESS = 188;
+    int PR_RETRIEVE_POSITION = 208;
+    /** Property constant - XSL 1.1 */
+    int PR_RETRIEVE_POSITION_WITHIN_TABLE = 209;
     /** Property constant */
-    int PR_RIGHT = 189;
+    int PR_RICHNESS = 210;
     /** Property constant */
-    int PR_ROLE = 190;
+    int PR_RIGHT = 211;
     /** Property constant */
-    int PR_RULE_STYLE = 191;
+    int PR_ROLE = 212;
     /** Property constant */
-    int PR_RULE_THICKNESS = 192;
+    int PR_RULE_STYLE = 213;
     /** Property constant */
-    int PR_SCALING = 193;
+    int PR_RULE_THICKNESS = 214;
     /** Property constant */
-    int PR_SCALING_METHOD = 194;
+    int PR_SCALING = 215;
     /** Property constant */
-    int PR_SCORE_SPACES = 195;
+    int PR_SCALING_METHOD = 216;
     /** Property constant */
-    int PR_SCRIPT = 196;
+    int PR_SCORE_SPACES = 217;
     /** Property constant */
-    int PR_SHOW_DESTINATION = 197;
+    int PR_SCRIPT = 218;
     /** Property constant */
-    int PR_SIZE = 198;
+    int PR_SHOW_DESTINATION = 219;
     /** Property constant */
-    int PR_SOURCE_DOCUMENT = 199;
+    int PR_SIZE = 220;
     /** Property constant */
-    int PR_SPACE_AFTER = 200;
+    int PR_SOURCE_DOCUMENT = 221;
     /** Property constant */
-    int PR_SPACE_BEFORE = 201;
+    int PR_SPACE_AFTER = 222;
     /** Property constant */
-    int PR_SPACE_END = 202;
+    int PR_SPACE_BEFORE = 223;
     /** Property constant */
-    int PR_SPACE_START = 203;
+    int PR_SPACE_END = 224;
     /** Property constant */
-    int PR_SPAN = 204;
+    int PR_SPACE_START = 225;
     /** Property constant */
-    int PR_SPEAK = 205;
+    int PR_SPAN = 226;
     /** Property constant */
-    int PR_SPEAK_HEADER = 206;
+    int PR_SPEAK = 227;
     /** Property constant */
-    int PR_SPEAK_NUMERAL = 207;
+    int PR_SPEAK_HEADER = 228;
     /** Property constant */
-    int PR_SPEAK_PUNCTUATION = 208;
+    int PR_SPEAK_NUMERAL = 229;
     /** Property constant */
-    int PR_SPEECH_RATE = 209;
+    int PR_SPEAK_PUNCTUATION = 230;
     /** Property constant */
-    int PR_SRC = 210;
+    int PR_SPEECH_RATE = 231;
     /** Property constant */
-    int PR_START_INDENT = 211;
+    int PR_SRC = 232;
     /** Property constant */
-    int PR_STARTING_STATE = 212;
+    int PR_START_INDENT = 233;
     /** Property constant */
-    int PR_STARTS_ROW = 213;
+    int PR_STARTING_STATE = 234;
     /** Property constant */
-    int PR_STRESS = 214;
+    int PR_STARTS_ROW = 235;
     /** Property constant */
-    int PR_SUPPRESS_AT_LINE_BREAK = 215;
+    int PR_STRESS = 236;
     /** Property constant */
-    int PR_SWITCH_TO = 216;
+    int PR_SUPPRESS_AT_LINE_BREAK = 237;
     /** Property constant */
-    int PR_TABLE_LAYOUT = 217;
+    int PR_SWITCH_TO = 238;
     /** Property constant */
-    int PR_TABLE_OMIT_FOOTER_AT_BREAK = 218;
+    int PR_TABLE_LAYOUT = 239;
     /** Property constant */
-    int PR_TABLE_OMIT_HEADER_AT_BREAK = 219;
+    int PR_TABLE_OMIT_FOOTER_AT_BREAK = 240;
     /** Property constant */
-    int PR_TARGET_PRESENTATION_CONTEXT = 220;
+    int PR_TABLE_OMIT_HEADER_AT_BREAK = 241;
     /** Property constant */
-    int PR_TARGET_PROCESSING_CONTEXT = 221;
+    int PR_TARGET_PRESENTATION_CONTEXT = 242;
     /** Property constant */
-    int PR_TARGET_STYLESHEET = 222;
+    int PR_TARGET_PROCESSING_CONTEXT = 243;
     /** Property constant */
-    int PR_TEXT_ALIGN = 223;
+    int PR_TARGET_STYLESHEET = 244;
     /** Property constant */
-    int PR_TEXT_ALIGN_LAST = 224;
+    int PR_TEXT_ALIGN = 245;
     /** Property constant */
-    int PR_TEXT_ALTITUDE = 225;
+    int PR_TEXT_ALIGN_LAST = 246;
     /** Property constant */
-    int PR_TEXT_DECORATION = 226;
+    int PR_TEXT_ALTITUDE = 247;
     /** Property constant */
-    int PR_TEXT_DEPTH = 227;
+    int PR_TEXT_DECORATION = 248;
     /** Property constant */
-    int PR_TEXT_INDENT = 228;
+    int PR_TEXT_DEPTH = 249;
     /** Property constant */
-    int PR_TEXT_SHADOW = 229;
+    int PR_TEXT_INDENT = 250;
     /** Property constant */
-    int PR_TEXT_TRANSFORM = 230;
+    int PR_TEXT_SHADOW = 251;
     /** Property constant */
-    int PR_TOP = 231;
+    int PR_TEXT_TRANSFORM = 252;
     /** Property constant */
-    int PR_TREAT_AS_WORD_SPACE = 232;
+    int PR_TOP = 253;
     /** Property constant */
-    int PR_UNICODE_BIDI = 233;
+    int PR_TREAT_AS_WORD_SPACE = 254;
     /** Property constant */
-    int PR_VERTICAL_ALIGN = 234;
+    int PR_UNICODE_BIDI = 255;
     /** Property constant */
-    int PR_VISIBILITY = 235;
+    int PR_VERTICAL_ALIGN = 256;
     /** Property constant */
-    int PR_VOICE_FAMILY = 236;
+    int PR_VISIBILITY = 257;
     /** Property constant */
-    int PR_VOLUME = 237;
+    int PR_VOICE_FAMILY = 258;
     /** Property constant */
-    int PR_WHITE_SPACE = 238;
+    int PR_VOLUME = 259;
     /** Property constant */
-    int PR_WHITE_SPACE_COLLAPSE = 239;
+    int PR_WHITE_SPACE = 260;
     /** Property constant */
-    int PR_WHITE_SPACE_TREATMENT = 240;
+    int PR_WHITE_SPACE_COLLAPSE = 261;
     /** Property constant */
-    int PR_WIDOWS = 241;
+    int PR_WHITE_SPACE_TREATMENT = 262;
     /** Property constant */
-    int PR_WIDTH = 242;
+    int PR_WIDOWS = 263;
     /** Property constant */
-    int PR_WORD_SPACING = 243;
+    int PR_WIDTH = 264;
     /** Property constant */
-    int PR_WRAP_OPTION = 244;
+    int PR_WORD_SPACING = 265;
     /** Property constant */
-    int PR_WRITING_MODE = 245;
+    int PR_WRAP_OPTION = 266;
     /** Property constant */
-    int PR_XML_LANG = 246;
+    int PR_WRITING_MODE = 267;
     /** Property constant */
-    int PR_Z_INDEX = 247;
+    int PR_XML_LANG = 268;
     /** Property constant */
-    int PR_INTRUSION_DISPLACE = 248;
-    /** Property constant - XSL 1.1 */
-    int PR_INDEX_CLASS = 249;
-    /** Property constant - XSL 1.1 */
-    int PR_INDEX_KEY = 250;
+    int PR_Z_INDEX = 269;
     /** Property constant - FOP proprietary: Custom extension for line alignment */
-    int PR_X_BLOCK_PROGRESSION_UNIT = 251;
+    int PR_X_BLOCK_PROGRESSION_UNIT = 270;
     /** Property constant - FOP proprietary: limit for widow content in lists and tables */
-    int PR_X_WIDOW_CONTENT_LIMIT = 252;
+    int PR_X_WIDOW_CONTENT_LIMIT = 271;
     /** Property constant - FOP proprietary: limit for orphan content in lists and tables */
-    int PR_X_ORPHAN_CONTENT_LIMIT = 253;
-    /** Property constant */
-    int PR_RETRIEVE_POSITION_WITHIN_TABLE = 254;
-    /** Property constant */
-    int PR_RETRIEVE_BOUNDARY_WITHIN_TABLE = 255;
+    int PR_X_ORPHAN_CONTENT_LIMIT = 272;
     /** Number of property constants defined */
-    int PROPERTY_COUNT = 255;
+    int PROPERTY_COUNT = 272;
 
     // compound property constants
 
@@ -1113,6 +1185,16 @@
     int EN_TABLE = 194;
     /** Enumeration constant -- for fo:retrieve-table-marker */
     int EN_TABLE_FRAGMENT = 195;
+    /** Enumeration constant -- XSL 1.1 */
+    int EN_MERGE = 196;
+    /** Enumeration constant -- XSL 1.1 */
+    int EN_LEAVE_SEPARATE = 197;
+    /** Enumeration constant -- XSL 1.1 */
+    int EN_LINK = 198;
+    /** Enumeration constant -- XSL 1.1 */
+    int EN_NO_LINK = 199;
+    /** Enumeration constant -- XSL 1.1 */
+    int EN_ALTERNATE = 200;
     /** Number of enumeration constants defined */
-    int ENUM_COUNT = 195;
+    int ENUM_COUNT = 200;
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message