You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-dev@xmlgraphics.apache.org by Chris Bowditch <bo...@hotmail.com> on 2014/04/29 16:19:33 UTC
Re: svn commit: r1590754 - in /xmlgraphics/fop/branches/Temp_WhitespaceManagement:
src/java/org/apache/fop/fo/ src/java/org/apache/fop/fo/flow/ src/java/org/apache/fop/layoutmgr/
test/layoutengine/standard-testcases/
Hi Vincent,
I don't want to detract from the good work that you are doing to the
Whitespace management extension. However, it seems wrong to be
developing on a branch after a vote passed to merge the branch into
trunk. You have effectively changed the code that was voted on, making
me wonder if we need a new vote now to vote on the new code before it
can be merged into trunk.
Thanks,
Chris
On 28/04/2014 20:22, vhennebert@apache.org wrote:
> Author: vhennebert
> Date: Mon Apr 28 19:22:32 2014
> New Revision: 1590754
>
> URL: http://svn.apache.org/r1590754
> Log:
> Renamed value of auto-toggle property to select-first-fitting
>
> Added:
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml
> - copied, changed from r1582318, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml
> - copied, changed from r1588548, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml
> - copied, changed from r1582318, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml
> - copied, changed from r1582469, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml
> - copied, changed from r1588548, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml
> - copied, changed from r1585822, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml
> Removed:
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml
> Modified:
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java
> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java
>
> Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java?rev=1590754&r1=1590753&r2=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java Mon Apr 28 19:22:32 2014
> @@ -1263,6 +1263,8 @@ public interface Constants {
> int EN_TB_LR = 205; // for top-to-bottom, left-to-right writing mode
> /** Enumeration constant -- for fo:retrieve-table-marker */
> int EN_FIRST_INCLUDING_CARRYOVER = 206;
> + /** Enumeration constant -- for auto-toggle */
> + int EN_SELECT_FIRST_FITTING = 207;
> /** Number of enumeration constants defined */
> - int ENUM_COUNT = 206;
> + int ENUM_COUNT = 207;
> }
>
> Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=1590754&r1=1590753&r2=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java Mon Apr 28 19:22:32 2014
> @@ -2618,9 +2618,10 @@ public final class FOPropertyMapping imp
> addPropertyMaker("fox:alt-text", m);
>
> // fox:auto-toggle, used only in fo:multi-switch
> - m = new StringProperty.Maker(PR_X_AUTO_TOGGLE);
> + m = new EnumProperty.Maker(PR_X_AUTO_TOGGLE);
> m.setInherited(false);
> - m.setDefault("");
> + m.addEnum("select-first-fitting", getEnumProperty(EN_SELECT_FIRST_FITTING, "SELECT_FIRST_FITTING"));
> + m.setDefault("select-first-fitting");
> addPropertyMaker("fox:auto-toggle", m);
>
> // fox:border-*-radius-*
>
> Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java?rev=1590754&r1=1590753&r2=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java Mon Apr 28 19:22:32 2014
> @@ -38,7 +38,7 @@ public class MultiSwitch extends FObj {
> // private CommonAccessibility commonAccessibility;
> // End of property values
>
> - private String autoToggle;
> + private int autoToggle;
>
> /**
> * Base constructor
> @@ -53,7 +53,7 @@ public class MultiSwitch extends FObj {
> @Override
> public void bind(PropertyList pList) throws FOPException {
> super.bind(pList);
> - autoToggle = pList.get(PR_X_AUTO_TOGGLE).getString();
> + autoToggle = pList.get(PR_X_AUTO_TOGGLE).getEnum();
> // autoRestore = pList.get(PR_AUTO_RESTORE);
> }
>
> @@ -95,7 +95,7 @@ public class MultiSwitch extends FObj {
> return FO_MULTI_SWITCH;
> }
>
> - public String getAutoToggle() {
> + public int getAutoToggle() {
> return autoToggle;
> }
>
>
> Modified: xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java?rev=1590754&r1=1590753&r2=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java Mon Apr 28 19:22:32 2014
> @@ -21,6 +21,7 @@ import java.util.LinkedList;
> import java.util.List;
>
> import org.apache.fop.area.Area;
> +import org.apache.fop.fo.Constants;
> import org.apache.fop.fo.FObj;
> import org.apache.fop.fo.flow.MultiSwitch;
>
> @@ -118,7 +119,7 @@ public class MultiSwitchLayoutManager ex
> public MultiSwitchLayoutManager(FObj node) {
> super(node);
> MultiSwitch multiSwitchNode = (MultiSwitch) node;
> - if (multiSwitchNode.getAutoToggle().equals("best-fit")) {
> + if (multiSwitchNode.getAutoToggle() == Constants.EN_SELECT_FIRST_FITTING) {
> knuthGen = new WhitespaceManagement();
> } else {
> knuthGen = new DefaultKnuthListGenerator();
>
> Copied: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml (from r1582318, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml)
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml&r1=1582318&r2=1590754&rev=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml Mon Apr 28 19:22:32 2014
> @@ -31,7 +31,7 @@
> </fo:layout-master-set>
> <fo:page-sequence master-reference="page">
> <fo:flow flow-name="xsl-region-body">
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>First variant</fo:block>
> </fo:multi-case>
>
> Copied: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml (from r1588548, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml)
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml&r1=1588548&r2=1590754&rev=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml Mon Apr 28 19:22:32 2014
> @@ -33,20 +33,20 @@
> <fo:flow flow-name="xsl-region-body">
> <fo:block break-after="page">
> Block 1 page 1
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>MS1 Variant 1</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> </fo:block>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>MS2 Variant 1</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> <fo:block break-before="page">
> Block 2 page 3
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>MS3 Variant 1</fo:block>
> </fo:multi-case>
>
> Copied: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml (from r1582318, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml)
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml&r1=1582318&r2=1590754&rev=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml Mon Apr 28 19:22:32 2014
> @@ -32,7 +32,7 @@
> <fo:page-sequence master-reference="page">
> <fo:flow flow-name="xsl-region-body" font-size="8pt" line-height="10pt">
> <fo:block>Before the multi-switch</fo:block>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>First variant</fo:block>
> </fo:multi-case>
>
> Copied: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml (from r1582469, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml)
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml&r1=1582469&r2=1590754&rev=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml Mon Apr 28 19:22:32 2014
> @@ -41,7 +41,7 @@
> <fo:block>Page 1 line 3</fo:block>
> <fo:block font-size="16pt" line-height="20pt">Filler</fo:block>
> <fo:block>Before the multi-switch</fo:block>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>Variant 1 line 1</fo:block>
> <fo:block>Variant 1 line 2</fo:block>
> @@ -64,7 +64,7 @@
> <fo:block>Page 2 line 1</fo:block>
> <fo:block font-size="16pt" line-height="20pt">Filler</fo:block>
> <fo:block>Before the multi-switch</fo:block>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>Variant 1 line 1</fo:block>
> <fo:block>Variant 1 line 2</fo:block>
> @@ -88,7 +88,7 @@
> <fo:block>Page 2 line 2</fo:block>
> <fo:block font-size="16pt" line-height="20pt">Filler</fo:block>
> <fo:block>Before the multi-switch</fo:block>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>Variant 1 line 1</fo:block>
> <fo:block>Variant 1 line 2</fo:block>
>
> Copied: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml (from r1588548, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml)
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml&r1=1588548&r2=1590754&rev=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml Mon Apr 28 19:22:32 2014
> @@ -31,17 +31,17 @@
> </fo:layout-master-set>
> <fo:page-sequence master-reference="page">
> <fo:flow flow-name="xsl-region-body">
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block padding="10pt">MS1 Variant 1</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block padding-before="10pt" padding-after="10pt">MS2 Variant 1</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>
> <fo:inline padding-start="10pt" padding-end="10pt">MS3 Variant 1</fo:inline>
>
> Copied: xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml (from r1585822, xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml)
> URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml&r1=1585822&r2=1590754&rev=1590754&view=diff
> ==============================================================================
> --- xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml (original)
> +++ xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml Mon Apr 28 19:22:32 2014
> @@ -32,17 +32,17 @@
> </fo:layout-master-set>
> <fo:page-sequence master-reference="page">
> <fo:flow flow-name="xsl-region-body">
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>MS 1 Variant 1</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>MS 2 Variant 1</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>MS 3 Variant 1</fo:block>
> </fo:multi-case>
> @@ -52,17 +52,17 @@
>
> <fo:page-sequence master-reference="page">
> <fo:flow flow-name="xsl-region-body">
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block line-height="70pt">MS 1 Variant 1</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>MS 2 Variant 1</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block line-height="50pt">MS 3 Variant 1</fo:block>
> </fo:multi-case>
> @@ -70,7 +70,7 @@
> <fo:block>MS 3 Variant 2</fo:block>
> </fo:multi-case>
> </fo:multi-switch>
> - <fo:multi-switch fox:auto-toggle="best-fit">
> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
> <fo:multi-case>
> <fo:block>MS 4 Variant 1</fo:block>
> </fo:multi-case>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
> For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
>
>
>
Re: svn commit: r1590754 - in /xmlgraphics/fop/branches/Temp_WhitespaceManagement:
src/java/org/apache/fop/fo/ src/java/org/apache/fop/fo/flow/ src/java/org/apache/fop/layoutmgr/
test/layoutengine/standard-testcases/
Posted by Vincent Hennebert <vh...@gmail.com>.
Hi Chris,
On 29/04/14 16:19, Chris Bowditch wrote:
> Hi Vincent,
>
> I don't want to detract from the good work that you are doing to the
> Whitespace management extension. However, it seems wrong to be developing on a
> branch after a vote passed to merge the branch into trunk. You have
> effectively changed the code that was voted on, making me wonder if we need a
> new vote now to vote on the new code before it can be merged into trunk.
I don’t believe so. All I’m doing is the last bits of clean-up. The only
change worth noting is the value of the property changed from ‘best-fit’
to ‘select-first-fitting’, but that was discussed on JIRA and during the
vote. The functionality remains the same as well as the key parts of the
code.
So I believe it should be ok to do the merge?
> Thanks,
>
> Chris
Vincent
> On 28/04/2014 20:22, vhennebert@apache.org wrote:
>> Author: vhennebert
>> Date: Mon Apr 28 19:22:32 2014
>> New Revision: 1590754
>>
>> URL: http://svn.apache.org/r1590754
>> Log:
>> Renamed value of auto-toggle property to select-first-fitting
>>
>> Added:
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml
>>
>> - copied, changed from r1582318,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml
>>
>> - copied, changed from r1588548,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml
>>
>> - copied, changed from r1582318,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml
>>
>> - copied, changed from r1582469,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml
>>
>> - copied, changed from r1588548,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml
>>
>> - copied, changed from r1585822,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml
>>
>> Removed:
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml
>>
>> Modified:
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java
>>
>>
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java
>>
>>
>> Modified:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java?rev=1590754&r1=1590753&r2=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/Constants.java
>> Mon Apr 28 19:22:32 2014
>> @@ -1263,6 +1263,8 @@ public interface Constants {
>> int EN_TB_LR = 205; // for top-to-bottom, left-to-right writing mode
>> /** Enumeration constant -- for fo:retrieve-table-marker */
>> int EN_FIRST_INCLUDING_CARRYOVER = 206;
>> + /** Enumeration constant -- for auto-toggle */
>> + int EN_SELECT_FIRST_FITTING = 207;
>> /** Number of enumeration constants defined */
>> - int ENUM_COUNT = 206;
>> + int ENUM_COUNT = 207;
>> }
>>
>> Modified:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=1590754&r1=1590753&r2=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/FOPropertyMapping.java
>> Mon Apr 28 19:22:32 2014
>> @@ -2618,9 +2618,10 @@ public final class FOPropertyMapping imp
>> addPropertyMaker("fox:alt-text", m);
>> // fox:auto-toggle, used only in fo:multi-switch
>> - m = new StringProperty.Maker(PR_X_AUTO_TOGGLE);
>> + m = new EnumProperty.Maker(PR_X_AUTO_TOGGLE);
>> m.setInherited(false);
>> - m.setDefault("");
>> + m.addEnum("select-first-fitting",
>> getEnumProperty(EN_SELECT_FIRST_FITTING, "SELECT_FIRST_FITTING"));
>> + m.setDefault("select-first-fitting");
>> addPropertyMaker("fox:auto-toggle", m);
>> // fox:border-*-radius-*
>>
>> Modified:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java?rev=1590754&r1=1590753&r2=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/fo/flow/MultiSwitch.java
>> Mon Apr 28 19:22:32 2014
>> @@ -38,7 +38,7 @@ public class MultiSwitch extends FObj {
>> // private CommonAccessibility commonAccessibility;
>> // End of property values
>> - private String autoToggle;
>> + private int autoToggle;
>> /**
>> * Base constructor
>> @@ -53,7 +53,7 @@ public class MultiSwitch extends FObj {
>> @Override
>> public void bind(PropertyList pList) throws FOPException {
>> super.bind(pList);
>> - autoToggle = pList.get(PR_X_AUTO_TOGGLE).getString();
>> + autoToggle = pList.get(PR_X_AUTO_TOGGLE).getEnum();
>> // autoRestore = pList.get(PR_AUTO_RESTORE);
>> }
>> @@ -95,7 +95,7 @@ public class MultiSwitch extends FObj {
>> return FO_MULTI_SWITCH;
>> }
>> - public String getAutoToggle() {
>> + public int getAutoToggle() {
>> return autoToggle;
>> }
>>
>> Modified:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java?rev=1590754&r1=1590753&r2=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/src/java/org/apache/fop/layoutmgr/MultiSwitchLayoutManager.java
>> Mon Apr 28 19:22:32 2014
>> @@ -21,6 +21,7 @@ import java.util.LinkedList;
>> import java.util.List;
>> import org.apache.fop.area.Area;
>> +import org.apache.fop.fo.Constants;
>> import org.apache.fop.fo.FObj;
>> import org.apache.fop.fo.flow.MultiSwitch;
>> @@ -118,7 +119,7 @@ public class MultiSwitchLayoutManager ex
>> public MultiSwitchLayoutManager(FObj node) {
>> super(node);
>> MultiSwitch multiSwitchNode = (MultiSwitch) node;
>> - if (multiSwitchNode.getAutoToggle().equals("best-fit")) {
>> + if (multiSwitchNode.getAutoToggle() ==
>> Constants.EN_SELECT_FIRST_FITTING) {
>> knuthGen = new WhitespaceManagement();
>> } else {
>> knuthGen = new DefaultKnuthListGenerator();
>>
>> Copied:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml
>> (from r1582318,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml)
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml&r1=1582318&r2=1590754&rev=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit.xml
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting.xml
>> Mon Apr 28 19:22:32 2014
>> @@ -31,7 +31,7 @@
>> </fo:layout-master-set>
>> <fo:page-sequence master-reference="page">
>> <fo:flow flow-name="xsl-region-body">
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>First variant</fo:block>
>> </fo:multi-case>
>>
>> Copied:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml
>> (from r1588548,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml)
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml&r1=1588548&r2=1590754&rev=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_forced_page_break.xml
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_forced-page-break.xml
>> Mon Apr 28 19:22:32 2014
>> @@ -33,20 +33,20 @@
>> <fo:flow flow-name="xsl-region-body">
>> <fo:block break-after="page">
>> Block 1 page 1
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>MS1 Variant 1</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> </fo:block>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>MS2 Variant 1</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> <fo:block break-before="page">
>> Block 2 page 3
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>MS3 Variant 1</fo:block>
>> </fo:multi-case>
>>
>> Copied:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml
>> (from r1582318,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml)
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml&r1=1582318&r2=1590754&rev=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_middle-page.xml
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_middle-page.xml
>> Mon Apr 28 19:22:32 2014
>> @@ -32,7 +32,7 @@
>> <fo:page-sequence master-reference="page">
>> <fo:flow flow-name="xsl-region-body" font-size="8pt"
>> line-height="10pt">
>> <fo:block>Before the multi-switch</fo:block>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>First variant</fo:block>
>> </fo:multi-case>
>>
>> Copied:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml
>> (from r1582469,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml)
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml&r1=1582469&r2=1590754&rev=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple-variants.xml
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_multiple-variants.xml
>> Mon Apr 28 19:22:32 2014
>> @@ -41,7 +41,7 @@
>> <fo:block>Page 1 line 3</fo:block>
>> <fo:block font-size="16pt" line-height="20pt">Filler</fo:block>
>> <fo:block>Before the multi-switch</fo:block>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>Variant 1 line 1</fo:block>
>> <fo:block>Variant 1 line 2</fo:block>
>> @@ -64,7 +64,7 @@
>> <fo:block>Page 2 line 1</fo:block>
>> <fo:block font-size="16pt" line-height="20pt">Filler</fo:block>
>> <fo:block>Before the multi-switch</fo:block>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>Variant 1 line 1</fo:block>
>> <fo:block>Variant 1 line 2</fo:block>
>> @@ -88,7 +88,7 @@
>> <fo:block>Page 2 line 2</fo:block>
>> <fo:block font-size="16pt" line-height="20pt">Filler</fo:block>
>> <fo:block>Before the multi-switch</fo:block>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>Variant 1 line 1</fo:block>
>> <fo:block>Variant 1 line 2</fo:block>
>>
>> Copied:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml
>> (from r1588548,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml)
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml&r1=1588548&r2=1590754&rev=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_padding.xml
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_padding.xml
>> Mon Apr 28 19:22:32 2014
>> @@ -31,17 +31,17 @@
>> </fo:layout-master-set>
>> <fo:page-sequence master-reference="page">
>> <fo:flow flow-name="xsl-region-body">
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block padding="10pt">MS1 Variant 1</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block padding-before="10pt" padding-after="10pt">MS2
>> Variant 1</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>
>> <fo:inline padding-start="10pt" padding-end="10pt">MS3
>> Variant 1</fo:inline>
>>
>> Copied:
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml
>> (from r1585822,
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml)
>>
>> URL:
>> http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml?p2=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml&p1=xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml&r1=1585822&r2=1590754&rev=1590754&view=diff
>>
>> ==============================================================================
>> ---
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_best-fit_multiple_dynamic_contents.xml
>> (original)
>> +++
>> xmlgraphics/fop/branches/Temp_WhitespaceManagement/test/layoutengine/standard-testcases/multi-switch_select-first-fitting_several-multi-switch.xml
>> Mon Apr 28 19:22:32 2014
>> @@ -32,17 +32,17 @@
>> </fo:layout-master-set>
>> <fo:page-sequence master-reference="page">
>> <fo:flow flow-name="xsl-region-body">
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>MS 1 Variant 1</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>MS 2 Variant 1</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>MS 3 Variant 1</fo:block>
>> </fo:multi-case>
>> @@ -52,17 +52,17 @@
>> <fo:page-sequence master-reference="page">
>> <fo:flow flow-name="xsl-region-body">
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block line-height="70pt">MS 1 Variant 1</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>MS 2 Variant 1</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block line-height="50pt">MS 3 Variant 1</fo:block>
>> </fo:multi-case>
>> @@ -70,7 +70,7 @@
>> <fo:block>MS 3 Variant 2</fo:block>
>> </fo:multi-case>
>> </fo:multi-switch>
>> - <fo:multi-switch fox:auto-toggle="best-fit">
>> + <fo:multi-switch fox:auto-toggle="select-first-fitting">
>> <fo:multi-case>
>> <fo:block>MS 4 Variant 1</fo:block>
>> </fo:multi-case>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
>> For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org
>>
>>
>>
>