xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spepp...@apache.org
Subject svn commit: r1080144 - in /xmlgraphics/fop/branches/Temp_ComplexScripts: ./ src/documentation/content/xdocs/ src/java/org/apache/fop/afp/apps/ src/java/org/apache/fop/afp/parser/ src/java/org/apache/fop/layoutmgr/ src/java/org/apache/fop/layoutmgr/inli...
Date Thu, 10 Mar 2011 08:04:41 GMT
Author: spepping
Date: Thu Mar 10 08:04:40 2011
New Revision: 1080144

URL: http://svn.apache.org/viewvc?rev=1080144&view=rev
Log:
Merged trunk:r1071913-1080138

Added:
    xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/keep-together_overflow-recovery_bug49835.xml
      - copied unchanged from r1080138, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/keep-together_overflow-recovery_bug49835.xml
    xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml
      - copied unchanged from r1080138, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-headings_inline_padding-start.xml
Modified:
    xmlgraphics/fop/branches/Temp_ComplexScripts/   (props changed)
    xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml
    xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/team.xml
    xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/apps/   (props
changed)
    xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/parser/   (props
changed)
    xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
    xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java
    xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
    xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/util/ColorExt.java
  (props changed)
    xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml
    xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml

Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:04:40 2011
@@ -2,4 +2,4 @@
 /xmlgraphics/fop/branches/Temp_Color:956535-1069429
 /xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
 /xmlgraphics/fop/branches/fop-1_0:959975-964707
-/xmlgraphics/fop/trunk:981451-1071912
+/xmlgraphics/fop/trunk:981451-1080138

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml?rev=1080144&r1=1080143&r2=1080144&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml Thu Mar 10 08:04:40 2011
@@ -1501,8 +1501,20 @@ NOTE:
 <!-- =================================================================== -->
 <!-- Special target for Gump                                             -->
 <!-- =================================================================== -->
-  <target name="gump" depends="junit-reduced"/>
-<!-- =================================================================== -->
+  <target name="gump" depends="package,transcoder-pkg"/>
+  <target name="gump-test" depends="junit-full">
+    <fail>
+      <condition>
+        <or>
+          <isset property="fop.junit.error"/>
+          <isset property="fop.junit.failure"/>
+        </or>
+      </condition>
+      At least one unit test failed!
+    </fail>
+    <echo>All tests passed!</echo>
+  </target>
+  <!-- =================================================================== -->
 <!-- Clean targets                                                       -->
 <!-- =================================================================== -->
   <target name="clean" description="Cleans the build directory">

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/team.xml?rev=1080144&r1=1080143&r2=1080144&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/team.xml
(original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/team.xml
Thu Mar 10 08:04:40 2011
@@ -96,16 +96,25 @@
           for various documentation projects. He decided to contribute to FOP in order to
help 
           making it more feature complete.</li>
         <li id="lm">Louis Masters</li>
-        <li id="mn">Manoj Nair, Currently consulting for Sony Pictures Entertainment
in Los
-          Angeles, CA USA. Previously he worked with Java &amp; related technologies
specializing
-          in developing n-tier Web applications.</li>
+        <li id="mh">Mehdi Houshmand, Young developer from the UK with a background
in Physics. 
+          Worked on Flow Cytometry for research and military uses, Telecoms systems and CMS
software. 
+          Programmed in C/C++, Java and currently learning Python</li>
         <li id="rr"><link href="mailto:renaud.richardet AT gmail DOT com">Renaud
Richardet</link> (RR)
           is a Java Programmer interested in XML technologies. See his 
           <fork href="http://www.oslutions.com">home page</fork> for more information
about him.</li>
         <li id="vr">Vanukuri Venkat Reddy is a Senior Software Engineer in UK, using
XML Graphics
           Project and FOP for his work, and is committed to contributing more to the Apache
to be part
           a great team.</li>
-        <li id="ls">Luke Shannon, Java Programmer, Toronto, Canada</li>
+        <li id="ga">Dr. Glenn Adams is an independent consultant with 45+ years of
professional 
+          software design and development experience in areas ranging from embedded, real-time
systems, 
+          including military, marine and consumer electronics process control and digital
signal 
+          processing applications, to advanced typographic and multilingual text processing
systems. 
+          He is former technical director of the Unicode Consortium, and a co-author of the
Unicode Standard. 
+          He has 25+ years experience in developing international standards, serving on ISO
JTC1/SC2 
+          (Coded Character Sets) and JTC1/SC18/WG8 (Document Processing) committees, and
was actively 
+          involved in the creation of ISO 8879 (SGML), ISO/IEC 9541 (Font Information Interchange),

+          ISO/IEC 10179 (DSSSL), ISO/IEC 10180 (SPDL), ISO/IEC 10646 (Universal Coded Character
Set), 
+          and, within the W3C, on XSL-FO 1.0.</li>
       </ul>
     </section>
     <section id="founder">

Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/apps/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:04:40 2011
@@ -3,4 +3,4 @@
 /xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/afp/apps:956535-1069429
 /xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/afp/apps:684572,688085,688696
 /xmlgraphics/fop/branches/fop-1_0/src/java/org/apache/fop/afp/apps:959975-964707
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps:959946-1071912
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps:959946-1080138

Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:04:40 2011
@@ -3,4 +3,4 @@
 /xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/afp/parser:956535-1069429
 /xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/afp/parser:684572,688085,688696
 /xmlgraphics/fop/branches/fop-1_0/src/java/org/apache/fop/afp/parser:959975-964707
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser:959946-1071912
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser:959946-1080138

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=1080144&r1=1080143&r2=1080144&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
(original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
Thu Mar 10 08:04:40 2011
@@ -542,7 +542,6 @@ public abstract class BreakingAlgorithm 
         addNode(0, createNode(firstBoxIndex, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, null));
         KnuthNode lastForced = getNode(0);
 
-
         if (log.isTraceEnabled()) {
             log.trace("Looping over " + (par.size() - startIndex) + " elements");
             log.trace(par);
@@ -631,6 +630,17 @@ public abstract class BreakingAlgorithm 
             log.debug("Recovering from too long: " + lastTooLong);
         }
 
+        // if lastTooLong would be the very first break in the blockList, and
+        // the first element in the paragraph is not a penalty, add an auxiliary
+        // penalty now to make it possible to create a genuine 'empty' node that
+        // represents a break before the first box/glue
+        if (lastTooLong.previous.previous == null) {
+            ListElement el = (ListElement)this.par.get(0);
+            if (!el.isPenalty()) {
+                this.par.add(0, KnuthPenalty.DUMMY_ZERO_PENALTY);
+            }
+        }
+        
         // content would overflow, insert empty line/page and try again
         return createNode(
                 lastTooLong.previous.position, lastTooLong.previous.line + 1, 1,
@@ -873,6 +883,7 @@ public abstract class BreakingAlgorithm 
         if (log.isDebugEnabled()) {
             log.debug("Restarting at node " + restartingNode);
         }
+
         restartingNode.totalDemerits = 0;
         addNode(restartingNode.line, restartingNode);
         startLine = restartingNode.line;

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java?rev=1080144&r1=1080143&r2=1080144&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java
(original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java
Thu Mar 10 08:04:40 2011
@@ -43,6 +43,9 @@ public class KnuthPenalty extends KnuthE
 
     /** Used for flagged penalties. See Knuth algorithm. */
     public static final int FLAGGED_PENALTY = 50;
+    /** Dummy, zero-width penalty */
+    public static final KnuthPenalty DUMMY_ZERO_PENALTY
+            = new KnuthPenalty(0, 0, false, null, true);
 
     private int penalty;
     private boolean penaltyFlagged;

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=1080144&r1=1080143&r2=1080144&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
(original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
Thu Mar 10 08:04:40 2011
@@ -422,18 +422,6 @@ public class InlineLayoutManager extends
 
         setChildContext(new LayoutContext(context)); // Store current value
 
-        // If this LM has fence, make a new leading space specifier.
-        if (hasLeadingFence(areaCreated)) {
-            getContext().setLeadingSpace(new SpaceSpecifier(false));
-            getContext().setFlags(LayoutContext.RESOLVE_LEADING_SPACE, true);
-        } else {
-            getContext().setFlags(LayoutContext.RESOLVE_LEADING_SPACE, false);
-        }
-
-        if (getSpaceStart() != null) {
-            context.getLeadingSpace().addSpace(new SpaceVal(getSpaceStart(), this));
-        }
-
         // "Unwrap" the NonLeafPositions stored in parentIter and put
         // them in a new list.  Set lastLM to be the LayoutManager
         // which created the last Position: if the LAST_AREA flag is
@@ -447,12 +435,32 @@ public class InlineLayoutManager extends
         while (parentIter.hasNext()) {
             pos = parentIter.next();
             if (pos != null && pos.getPosition() != null) {
+                if (isFirst(pos)) {
+                    /*
+                     * If this element is a descendant of a table-header/footer,
+                     * its content may be repeated over pages, so the generation
+                     * of its areas may be restarted.
+                     */
+                    areaCreated = false;
+                }
                 positionList.add(pos.getPosition());
                 lastLM = pos.getPosition().getLM();
                 lastPos = pos;
             }
         }
 
+        // If this LM has fence, make a new leading space specifier.
+        if (hasLeadingFence(areaCreated)) {
+            getContext().setLeadingSpace(new SpaceSpecifier(false));
+            getContext().setFlags(LayoutContext.RESOLVE_LEADING_SPACE, true);
+        } else {
+            getContext().setFlags(LayoutContext.RESOLVE_LEADING_SPACE, false);
+        }
+
+        if (getSpaceStart() != null) {
+            context.getLeadingSpace().addSpace(new SpaceVal(getSpaceStart(), this));
+        }
+
         addMarkersToPage(
                 true,
                 !areaCreated,

Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/util/ColorExt.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:04:40 2011
@@ -3,4 +3,4 @@
 /xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ColorExt.java:603620-746655
 /xmlgraphics/fop/branches/Temp_Color/src/java/org/apache/fop/util/ColorExt.java:956535-1069429
 /xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/util/ColorExt.java:684572,688085,688696
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java:981451-1071912
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java:981451-1080138

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml?rev=1080144&r1=1080143&r2=1080144&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml Thu Mar 10 08:04:40 2011
@@ -59,6 +59,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Layout" dev="VH" type="fix" fixes-bug="50196" due-to="Matthias
Reischenbacher">
+        Bugzilla #50196: padding-start ignored when table-header/footer is repeated.
+      </action>
       <action context="Renderers" dev="JM" type="fix">
         Increased maximum possible PDF size from 2GB to around 9GB (hard maximum imposed
by the PDF specification).
       </action>

Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml?rev=1080144&r1=1080143&r2=1080144&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
(original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
Thu Mar 10 08:04:40 2011
@@ -217,11 +217,7 @@
   <checks>
     <eval expected="0" xpath="//pageSequence[1]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
     <eval expected="0" xpath="//pageSequence[1]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
-    <eval expected="12000" xpath="//pageSequence[1]/pageViewport[3]//span[2]/@bpd"/>
-    <!-- TODO Replace with the following test once bugs affecting multiple columns have
been 
-    corrected
-        <eval expected="0" xpath="count(//pageSequence[1]/pageViewport[3]//block[@prod-id='span2'])"/>
-    -->
+    <eval expected="0" xpath="count(//pageSequence[1]/pageViewport[3]//block[@prod-id='span2'])"/>
 
     <eval expected="24000" xpath="//pageSequence[2]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
     <eval expected="84000" xpath="//pageSequence[2]/pageViewport[3]//span[1]/flow[2]/@bpd"/>



---------------------------------------------------------------------
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