keiron 2002/11/06 07:57:11 Modified: test/resources/fop/image size.fo test/resources/fop/svg embed.fo Log: improved layout a bit, added some more examples of scaling Revision Changes Path 1.2 +31 -4 xml-fop/test/resources/fop/image/size.fo Index: size.fo =================================================================== RCS file: /home/cvs/xml-fop/test/resources/fop/image/size.fo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- size.fo 5 Jul 2002 06:10:54 -0000 1.1 +++ size.fo 6 Nov 2002 15:57:10 -0000 1.2 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<fo:root font-family="Times Roman" font-size="12pt" text-align="center" xmlns:fo="http://www.w3.org/1999/XSL/Format"> +<fo:root font-family="Times Roman" font-size="12pt" xmlns:fo="http://www.w3.org/1999/XSL/Format"> <fo:layout-master-set> <fo:simple-page-master @@ -11,8 +11,8 @@ page-width="21cm" page-height="29.7cm" master-name="left"> - <fo:region-before extent="1cm"/> - <fo:region-body margin-top="1cm"/> + <fo:region-before extent="0.5cm"/> + <fo:region-body margin-top="0.5cm" margin-bottom="1.7cm"/> <fo:region-after extent="1.5cm"/> </fo:simple-page-master> @@ -27,7 +27,7 @@ </fo:static-content> <fo:flow flow-name="xsl-region-body"> -<fo:block font-size="18pt" font-weight="bold">1. FOP test for images</fo:block> +<fo:block font-size="18pt" font-weight="bold" text-align="center">1. FOP test for images</fo:block> <fo:block> <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Normal</fo:block> <fo:block> @@ -77,6 +77,33 @@ The image (<fo:external-graphic width="50pt" height="50pt" overflow="error-if-overflow" src="file:logo.jpg"/>) is clipped with the content size double the viewport size. +This has <fo:inline font-style="italic">error-if-overflow</fo:inline> +set so there should be an error reported, it can recover from the +error by clipping to the viewport. + </fo:block> +</fo:block> + +<fo:block> + <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Scaling</fo:block> + <fo:block> +The image +(<fo:external-graphic content-width="100pt" content-height="50pt" scaling="non-uniform" src="file:logo.jpg"/>) +has non-uniform scaling. + </fo:block> + <fo:block> +The image +(<fo:external-graphic content-width="50pt" content-height="100pt" scaling="non-uniform" src="file:logo.jpg"/>) +has non-uniform scaling. + </fo:block> + <fo:block> +The image +(<fo:external-graphic content-width="100pt" content-height="75pt" scaling="uniform" src="file:logo.jpg"/>) +has uniform scaling. + </fo:block> + <fo:block> +The image +(<fo:external-graphic content-width="75pt" content-height="100pt" scaling="uniform" src="file:logo.jpg"/>) +has uniform scaling. </fo:block> </fo:block> 1.2 +6 -5 xml-fop/test/resources/fop/svg/embed.fo Index: embed.fo =================================================================== RCS file: /home/cvs/xml-fop/test/resources/fop/svg/embed.fo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- embed.fo 5 Jul 2002 09:20:13 -0000 1.1 +++ embed.fo 6 Nov 2002 15:57:11 -0000 1.2 @@ -3,7 +3,7 @@ <!ENTITY svgimage SYSTEM "blocks.ent"> ]> -<fo:root font-family="Times Roman" font-size="12pt" text-align="center" xmlns:fo="http://www.w3.org/1999/XSL/Format"> +<fo:root font-family="Times Roman" font-size="12pt" xmlns:fo="http://www.w3.org/1999/XSL/Format"> <fo:layout-master-set> <fo:simple-page-master @@ -30,7 +30,7 @@ </fo:static-content> <fo:flow flow-name="xsl-region-body"> -<fo:block font-size="18pt" font-weight="bold">Embedding SVG in Viewport</fo:block> +<fo:block font-size="18pt" font-weight="bold" text-align="center">Embedding SVG in Viewport</fo:block> <fo:block> <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Align in Larger Viewport</fo:block> @@ -78,9 +78,10 @@ <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Scaling</fo:block> <fo:block> Non-uniform -(<fo:instream-foreign-object content-width="100pt" content-height="50pt" scaling="non-uniform" overflow="hidden" text-align="start">&svgimage;</fo:instream-foreign-object>), uniform -(<fo:instream-foreign-object content-width="100pt" content-height="50pt" scaling="uniform" overflow="hidden" text-align="start">&svgimage;</fo:instream-foreign-object>), uniform -(<fo:instream-foreign-object content-width="50pt" content-height="100pt" scaling="uniform" overflow="hidden" text-align="start">&svgimage;</fo:instream-foreign-object>). +(<fo:instream-foreign-object content-width="100pt" content-height="50pt" scaling="non-uniform" overflow="hidden" text-align="start">&svgimage;</fo:instream-foreign-object>), non-uniform +(<fo:instream-foreign-object content-width="50pt" content-height="100pt" scaling="non-uniform" overflow="hidden" text-align="start">&svgimage;</fo:instream-foreign-object>), uniform +(<fo:instream-foreign-object content-width="100pt" content-height="75pt" scaling="uniform" overflow="hidden" text-align="start">&svgimage;</fo:instream-foreign-object>), uniform +(<fo:instream-foreign-object content-width="75pt" content-height="100pt" scaling="uniform" overflow="hidden" text-align="start">&svgimage;</fo:instream-foreign-object>). </fo:block> <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]