You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by sp...@apache.org on 2011/04/19 11:01:40 UTC
svn commit: r1094946 [1/2] - in
/xmlgraphics/fop/branches/Temp_ComplexScripts: ./
src/documentation/content/xdocs/ src/documentation/content/xdocs/trunk/
src/documentation/intermediate-format-ng/ src/java/org/apache/fop/afp/apps/
src/java/org/apache/fo...
Author: spepping
Date: Tue Apr 19 09:01:37 2011
New Revision: 1094946
URL: http://svn.apache.org/viewvc?rev=1094946&view=rev
Log:
Merged /xmlgraphics/fop/trunk:r1080139-1094916
Added:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/Viewport.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Viewport.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/BasicLinkArea.java
- copied, changed from r1094916, xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/BasicLinkArea.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineViewport.java
- copied, changed from r1094916, xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/fotree/testcases/text-decoration_invalid_bug51032.fo
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/fotree/testcases/text-decoration_invalid_bug51032.fo
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/
- copied from r1094916, xmlgraphics/fop/trunk/test/intermediate/
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/block-container.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/block-container.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/block-container_nested.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/block-container_nested.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/block.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/block.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/block_nested.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/block_nested.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/block_span_pages.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/block_span_pages.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/images.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/images.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/inlines.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/inlines.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/list.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/list.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/intermediate/table.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/intermediate/table.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/area/
- copied from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/area/BlockViewportTestCase.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/BlockViewportTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/area/RegionViewportTestCase.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/RegionViewportTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/area/ViewportTestCase.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/area/ViewportTestSuite.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/area/inline/
- copied from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/check/
- copied from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/check/
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/check/Check.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/check/Check.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/check/ChecksFactory.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/check/ChecksFactory.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/check/package-info.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/check/package-info.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/AbstractIFTestCase.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/IFChecksFactory.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFChecksFactory.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/IFTestCase.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/TestAssistant.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/TestAssistant.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/layoutengine/LayoutEngineChecksFactory.java
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineChecksFactory.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/basic-link_height.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_height.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/basic-link_height_baseline-shift.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_height_baseline-shift.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/basic-link_height_inline-child.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_height_inline-child.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/basic-link_height_multi-child.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_height_multi-child.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/basic-link_height_multi-line.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/basic-link_height_multi-line.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/block-container_bugzilla50965.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_bugzilla50965.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/block_white-space_bug50988.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_bug50988.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/table_keep-together_row-span.xml
- copied unchanged from r1094916, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_keep-together_row-span.xml
Removed:
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/layoutengine/TestEnvironment.java
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/documentation/content/xdocs/trunk/hyphenation.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
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/area/AreaTreeHandler.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/BlockViewport.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/RegionViewport.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/AbstractTextArea.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/FilledArea.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineArea.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineParent.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/FObjMixed.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/TextDecorationMaker.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/BFEntry.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.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/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFConstants.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFContext.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFParser.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/xml/XMLRenderer.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/java/org/apache/fop/StandardTestSuite.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/IFCheck.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/IFParserTestCase.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/IFTester.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/layoutengine/EvalCheck.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/layoutengine/ResultCheck.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/java/org/apache/fop/layoutengine/TrueCheck.java
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/disabled-testcases.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/basic-link_external-destination_2.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/bookmarks_1.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/table-row_keep-together.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/table-row_keep-together_2.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/table_keep-together.xml
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 09:01:37 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-1080138
+/xmlgraphics/fop/trunk:981451-1094916
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/build.xml Tue Apr 19 09:01:37 2011
@@ -956,7 +956,12 @@ list of possible build targets.
testsuite="org.apache.fop.intermediate.AreaTreeXMLFormatTestSuite"
outfile="TEST-area-tree-xml-format"/>
</target>
- <target name="junit-intermediate-format" depends="junit-compile"
+ <target name="junit-intermediate-layout" depends="junit-compile" if="xmlunit.present">
+ <junit-run title="intermediate format from layout tests"
+ testsuite="org.apache.fop.intermediate.LayoutIFTestSuite"
+ outfile="TEST-intermediate-format-from-layout"/>
+ </target>
+ <target name="junit-intermediate-format" depends="junit-compile,junit-intermediate-layout"
description="Runs FOP's intermediate format JUnit tests" if="xmlunit.present">
<junit-run title="intermediate format"
testsuite="org.apache.fop.intermediate.IntermediateFormatTestSuite"
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=1094946&r1=1094945&r2=1094946&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 Tue Apr 19 09:01:37 2011
@@ -31,28 +31,12 @@
<title>Active Committers</title>
<note label="Important">Please don't write to any developer directly if you need help on using FOP. Only if you submit questions to the <link href="maillist.html#fop-user">FOP User Mailing List</link> will other FOP users be able to profit from answers given to your question. Another point is that a developer may have gone inactive or is on holidays in which case you may not get an answer in time.</note>
<ul>
- <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> (MB) is currently a
- PostDoc pursuing an academic career in computer science. His main interest in FOP is to
- improve the DocBook to PDF tool-chain to produce high quality output, while still
- conforming to given style-guides. See his <link href="http://max.berger.name">home
- page</link> for more information.</li>
<li id="cb"><link href="mailto:bowditch_chris@hotmail.com">Chris Bowditch</link> (CB)
is a Java/VB Programmer from England.</li>
- <li id="jb"><link href="mailto:jay@bryantcs.com">Jay Bryant</link> (JB) is a
- freelance information architect in Austin, TX.</li>
<li id="ac"><link href="mailto:acumiskey AT apache.org">Adrian Cumiskey</link> (AC)
is an XP/Agile practitioner with interests in open source content management and electronic
document generation. He is a UK expat now residing in Singapore.</li>
<li id="ad"><link href="mailto:adelmelle@apache.org">Andreas Delmelle</link> (AD)</li>
- <!-- Luca prefers the mail address with "AT", to stop spam, etc. -->
- <li id="lf"><link href="mailto:lfurini AT cs.unibo.it">Luca Furini</link> (LF)
- is a student of Computer Studies at the University of Bologna (Italy)</li>
- <li id="cg"><link href="mailto:chrisg@apache.org">Christian Geisert</link> (CG)
- is a software engineer from Stutensee, Germany. He is working at
- <fork href="http://www.isu-gmbh.de">ISU GmbH</fork>, a provider of ERP solutions,
- where amongst lots of other things he is using FOP to produce nice looking
- business documents like order confirmations, quotes, invoices etc.
- </li>
<li id="vh"><link href="mailto:vhennebert@apache.org">Vincent Hennebert</link>
(VH), a Java developer from France; with an interest in typography, and in using
Fop as a pdf renderer for book-like documents.</li>
@@ -61,14 +45,6 @@
recent XML/XSL-FO convert, he has been nit-picking FAQs & assorted web
pages since his first webmaster position @brain.com in 1996. Most
important creation? He's got a couple of cool kids.</li>
- <li id="mm"><link href="mailto:manuel@apache.org">Manuel Mall</link> (MM)
- is an independant software engineer resident in Perth, Australia. Born a long time
- ago in Germany he has been involved in Software Engineering (Informatik) since the
- early 70's. Over the last years he has used FOP very successfully in commercial
- projects for his customers (currently generating roughly 15000 PDF files each
- working day through FOP) and has decided to put some effort back into FOP to
- make it even better.
- </li>
<li id="jm"><link href="mailto:jeremias@apache.org">Jeremias Märki</link> (JM)
is an independent software engineer and consultant from Lucerne, Switzerland. He's also
the creator of <fork href="http://barcode4j.sourceforge.net">Barcode4J</fork>.
@@ -79,10 +55,6 @@
from the TeX/LaTeX world. See his <fork href="http://www.leverkruid.eu">home
page</fork> for some of his private projects.</li>
<li id="jp"><link href="mailto:pietsch@apache.org">Jörg Pietschmann</link> (JP)</li>
- <li id="ps"><link href="mailto:tcho@club-internet.fr">Pascal Sancho</link> (PS)
- is an XML developper from Aix-en-Provence (France). He works on software solutions for
- rendering various kind of documents on various supports, more specifically taking care
- of PDF generation with FOP.</li>
</ul>
</section>
<section id="contribute-active">
@@ -91,17 +63,10 @@
<li id="gd">Georg Datterl is a software developer from Austria, currently working for
Geneon media solutions gmbh in Nuremberg, Germany. He needs FOP to wrestle gigabytes of
electronic data into thousands of printed pages.</li>
- <li id="ak">Alexander Kiel is a Java developer from Leipzig, Germany. Beside Java he is
- interested in XML and Web technologies. He used FOP as part of the Docbook/XML toolchain
- 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="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>
@@ -125,22 +90,26 @@
<section id="commit-inactive">
<title>Inactive Committers</title>
<ul>
+ <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> (MB)</li>
<li id="fb"><link href="mailto:bckfnn@worldonline.dk">Finn Bock</link> (FB)</li>
+ <li id="jb"><link href="mailto:jay@bryantcs.com">Jay Bryant</link> (JB)</li>
<li id="kc"><link href="mailto:kellyc@apache.org">Kelly Campbell</link></li>
<li id="sc"><link href="mailto:gears@apache.org">Steven Coffman</link></li>
<li id="bd"><link href="mailto:bdelacretaz@apache.org">Bertrand Delacretaz</link></li>
<li id="te"><link href="mailto:tore@apache.org">Tore Engvig</link></li>
+ <!-- Luca prefers the mail address with "AT", to stop spam, etc. -->
+ <li id="lf"><link href="mailto:lfurini AT cs.unibo.it">Luca Furini</link> (LF)</li>
+ <li id="cg"><link href="mailto:chrisg@apache.org">Christian Geisert</link> (CG)</li>
<li id="sg"><link href="mailto:stanislav@apache.org">Stanislav Gorkhover</link></li>
- <li id="ph"><link href="mailto:pherweg@web.de">Peter Herweg</link> (PH)<!-- is helping to
- integrate the jfor project's RTF support into the upcoming FOP 1.0 version.
- Born in 1978, he has been serving as an application developer for a small
- industrial company in Germany since 1999.--></li>
+ <li id="ph"><link href="mailto:pherweg@web.de">Peter Herweg</link> (PH)</li>
<li id="fj"><link href="mailto:fotis@apache.org">Fotis Jannidis</link></li>
<li id="kl"><link href="mailto:klease@apache.org">Karen Lease</link></li>
<li id="kll"><link href="mailto:keiron@apache.org">Keiron Liddle</link></li>
+ <li id="mm"><link href="mailto:manuel@apache.org">Manuel Mall</link> (MM)</li>
<li id="gm"><link href="mailto:gmazza@apache.org">Glen Mazza</link></li>
<li id="wvm"><link href="mailto:vmote@apache.org">Victor Mote</link></li>
<li id="jn"><link href="mailto:jordan@apache.org">Jordan Naftolin</link></li>
+ <li id="ps"><link href="mailto:tcho@club-internet.fr">Pascal Sancho</link> (PS)</li>
<li id="as"><link href="mailto:arved@apache.org">Arved Sandstrom</link></li>
<li id="es"><link href="mailto:eschaeffer@apache.org">Eric Schaeffer</link></li>
<li id="ot"><link href="mailto:olegt@apache.org">Oleg Tkachenko</link> (OT)</li>
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/hyphenation.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/hyphenation.xml?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/hyphenation.xml (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/content/xdocs/trunk/hyphenation.xml Tue Apr 19 09:01:37 2011
@@ -219,15 +219,15 @@
languages and dialects, especially ancient ones, may pose a real problem
though.</p>
<p>If you want to generate your own patterns, an open-source utility called
- patgen is available on many Unix/Linux distributions and every TeX
- distribution which can be used to assist in
- creating pattern files from dictionaries. Pattern creation for languages like
- english or german is an art. If you can, read Frank Liang's original paper
- "Word Hy-phen-a-tion by Com-pu-ter" (yes, with hyphens). It is not available
- online. The original patgen.web source, included in the TeX source distributions,
- contains valuable comments, unfortunately technical details obscure often the
- high level issues. Another important source is
- <a class="fork" href="http://www.ctan.org/tex-archive/systems/knuth/tex/texbook.tex">The
+ patgen can be used to assist in creating pattern files from dictionaries.
+ It is available in many Unix/Linux distributions and every TeX distribution.
+ Pattern creation for languages like english or german is an art. Read
+ Frank Liang's original paper <a class="fork" href="http://www.tug.org/docs/liang/">"Word
+ Hy-phen-a-tion by Com-pu-ter"</a> (yes, with hyphens) for details.
+ The original patgen.web source, included in the TeX source distributions,
+ contains valuable comments, unfortunately technical details often obscure the
+ high level issues. Another important source of information is
+ <a class="fork" href="http://mirrors.ctan.org/systems/knuth/dist/tex/texbook.tex">The
TeX Book</a>, appendix H (either read the TeX source, or run it through
TeX to typeset it). Secondary articles, for example the works by Petr Sojka,
may also give some much needed insight into problems arising in automated
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd Tue Apr 19 09:01:37 2011
@@ -42,6 +42,11 @@
</xs:complexContent>
</xs:complexType>
</xs:element>
+ <xs:element name="id">
+ <xs:complexType>
+ <xs:attribute name="name" use="required" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
<xs:element name="font">
<xs:complexType>
<xs:attribute name="family" type="xs:string"/>
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/apps/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 09:01:37 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-1080138
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps:959946-1094916
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 09:01:37 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-1080138
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser:959946-1094916
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeHandler.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeHandler.java Tue Apr 19 09:01:37 2011
@@ -336,7 +336,7 @@ public class AreaTreeHandler extends FOE
String[] ids = res.getIDRefs();
for (String id : ids) {
List<PageViewport> pageVPList = idTracker.getPageViewportsContainingID(id);
- if (pageVPList != null) {
+ if (pageVPList != null && !pageVPList.isEmpty()) {
res.resolveIDRef(id, pageVPList);
} else {
AreaEventProducer eventProducer = AreaEventProducer.Provider.get(
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeParser.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeParser.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/AreaTreeParser.java Tue Apr 19 09:01:37 2011
@@ -73,7 +73,7 @@ import org.apache.fop.area.inline.Leader
import org.apache.fop.area.inline.Space;
import org.apache.fop.area.inline.SpaceArea;
import org.apache.fop.area.inline.TextArea;
-import org.apache.fop.area.inline.Viewport;
+import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.fo.ElementMappingRegistry;
import org.apache.fop.fo.expr.PropertyException;
@@ -217,7 +217,7 @@ public class AreaTreeParser {
makers.put("word", new WordMaker());
makers.put("space", new SpaceMaker());
makers.put("leader", new LeaderMaker());
- makers.put("viewport", new ViewportMaker());
+ makers.put("viewport", new InlineViewportMaker());
makers.put("image", new ImageMaker());
makers.put("foreignObject", new ForeignObjectMaker());
makers.put("bookmarkTree", new BookmarkTreeMaker());
@@ -265,8 +265,8 @@ public class AreaTreeParser {
return (AbstractTextArea)findAreaType(AbstractTextArea.class);
}
- private Viewport getCurrentViewport() {
- return (Viewport)findAreaType(Viewport.class);
+ private InlineViewport getCurrentViewport() {
+ return (InlineViewport)findAreaType(InlineViewport.class);
}
/** {@inheritDoc} */
@@ -909,10 +909,10 @@ public class AreaTreeParser {
}
}
- private class ViewportMaker extends AbstractMaker {
+ private class InlineViewportMaker extends AbstractMaker {
public void startElement(Attributes attributes) {
- Viewport viewport = new Viewport(null);
+ InlineViewport viewport = new InlineViewport(null);
transferForeignObjects(attributes, viewport);
setAreaAttributes(attributes, viewport);
setTraits(attributes, viewport, SUBSET_COMMON);
@@ -929,7 +929,7 @@ public class AreaTreeParser {
}
public void endElement() {
- assertObjectOfClass(areaStack.pop(), Viewport.class);
+ assertObjectOfClass(areaStack.pop(), InlineViewport.class);
}
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/BlockViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/BlockViewport.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/BlockViewport.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/BlockViewport.java Tue Apr 19 09:01:37 2011
@@ -19,12 +19,14 @@
package org.apache.fop.area;
+import java.awt.Rectangle;
+
/**
* A BlockViewport.
* This is used for block level Viewport/reference pairs.
* The block-container creates this area.
*/
-public class BlockViewport extends Block {
+public class BlockViewport extends Block implements Viewport {
private static final long serialVersionUID = -7840580922580735157L;
@@ -78,14 +80,18 @@ public class BlockViewport extends Block
clip = cl;
}
- /**
- * Get the clipping for this viewport.
- *
- * @return the clipping for the viewport
- * true if the contents should be clipped for this viewport
- */
- public boolean getClip() {
+ /** {@inheritDoc} */
+ public boolean hasClip() {
return clip;
}
+
+ /** {@inheritDoc} */
+ public Rectangle getClipRectangle() {
+ if (clip) {
+ return new Rectangle(getIPD(), getBPD());
+ } else {
+ return null;
+ }
+ }
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/RegionViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/RegionViewport.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/RegionViewport.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/RegionViewport.java Tue Apr 19 09:01:37 2011
@@ -19,6 +19,7 @@
package org.apache.fop.area;
+import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
import java.util.HashMap;
@@ -29,7 +30,7 @@ import java.util.HashMap;
* region-reference-area as its child. These areas are described
* in the fo:region-body description in the XSL Recommendation.
*/
-public class RegionViewport extends Area implements Cloneable {
+public class RegionViewport extends Area implements Cloneable, Viewport {
private static final long serialVersionUID = 505781815165102572L;
@@ -75,11 +76,20 @@ public class RegionViewport extends Area
clip = c;
}
- /** @return true if the viewport should be clipped. */
- public boolean isClip() {
+ /** {@inheritDoc} */
+ public boolean hasClip() {
return this.clip;
}
+ /** {@inheritDoc} */
+ public Rectangle getClipRectangle() {
+ if (clip) {
+ return new Rectangle(getIPD(), getBPD());
+ } else {
+ return null;
+ }
+ }
+
/**
* Get the view area of this viewport.
*
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/AbstractTextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/AbstractTextArea.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/AbstractTextArea.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/AbstractTextArea.java Tue Apr 19 09:01:37 2011
@@ -185,4 +185,15 @@ public abstract class AbstractTextArea e
public void setBaselineOffset(int baselineOffset) {
this.baselineOffset = baselineOffset;
}
+
+ @Override
+ int getVirtualOffset() {
+ return getBlockProgressionOffset();
+ }
+
+ @Override
+ int getVirtualBPD() {
+ /* Word and space areas don't have a properly set bpd; return this area's bpd instead. */
+ return getBPD();
+ }
}
Copied: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/BasicLinkArea.java (from r1094916, xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/BasicLinkArea.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/BasicLinkArea.java?p2=xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/BasicLinkArea.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/BasicLinkArea.java&r1=1094916&r2=1094946&rev=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/BasicLinkArea.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/BasicLinkArea.java Tue Apr 19 09:01:37 2011
@@ -42,10 +42,10 @@ public class BasicLinkArea extends Inlin
* called after all of the children areas have been added to this area.
*/
/* Make this area start at its beforest child. */
- setOffset(getOffset() + minChildOffset);
+ setBlockProgressionOffset(getBlockProgressionOffset() + minChildOffset);
/* Update children offsets accordingly. */
for (InlineArea inline : inlines) {
- inline.setOffset(inline.getOffset() - minChildOffset);
+ inline.setBlockProgressionOffset(inline.getBlockProgressionOffset() - minChildOffset);
}
setBPD(getVirtualBPD());
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/FilledArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/FilledArea.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/FilledArea.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/FilledArea.java Tue Apr 19 09:01:37 2011
@@ -19,10 +19,10 @@
package org.apache.fop.area.inline;
-import java.util.List;
-import java.util.ListIterator;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
/**
* Filled area.
@@ -60,7 +60,7 @@ public class FilledArea extends InlinePa
InlineArea child = (InlineArea) childrenIterator.next();
if (child instanceof InlineParent) {
setChildOffset(((InlineParent) child).getChildAreas().listIterator(), v);
- } else if (child instanceof org.apache.fop.area.inline.Viewport) {
+ } else if (child instanceof InlineViewport) {
// nothing
} else {
child.setBlockProgressionOffset(v);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineArea.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineArea.java Tue Apr 19 09:01:37 2011
@@ -268,4 +268,31 @@ public class InlineArea extends Area {
storedIPDVariation += ipdVariation;
}
}
+
+ /**
+ * Returns the offset that this area would have if its offset and size were taking
+ * children areas into account. The bpd of an inline area is taken from its nominal
+ * font and doesn't depend on the bpds of its children elements. However, in the case
+ * of a basic-link element we want the active area to cover all of the children
+ * elements.
+ *
+ * @return the offset that this area would have if the before-edge of its
+ * content-rectangle were coinciding with the <q>beforest</q> before-edge of its
+ * children allocation-rectangles.
+ * @see #getVirtualBPD()
+ * @see BasicLinkArea
+ */
+ int getVirtualOffset() {
+ return getBlockProgressionOffset();
+ }
+
+ /**
+ * Returns the block-progression-dimension that this area would have if it were taking
+ * its children elements into account. See {@linkplain #getVirtualOffset()}.
+ *
+ * @return the bpd
+ */
+ int getVirtualBPD() {
+ return getBPD();
+ }
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineParent.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineParent.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineParent.java Tue Apr 19 09:01:37 2011
@@ -40,32 +40,43 @@ public class InlineParent extends Inline
/** Controls whether the IPD is automatically adjusted based on the area's children. */
protected transient boolean autoSize;
- /**
- * Create a new inline parent to add areas to.
- */
- public InlineParent() {
- }
+ /** The offset of the <q>beforest</q> child area of this area. */
+ protected int minChildOffset;
/**
- * Override generic Area method.
- *
- * @param childArea the child area to add
+ * The offset of the <q>afterest</q> child area of this area. Offset from the
+ * before-edge of this area's content-rectangle and the after-edge of the child area's
+ * allocation-rectangle.
*/
+ private int maxAfterEdge;
+
@Override
- public void addChildArea(Area childArea) {
+ public void addChildArea(Area c) {
+ assert c instanceof InlineArea;
if (inlines.size() == 0) {
autoSize = (getIPD() == 0);
}
- if (childArea instanceof InlineArea) {
- InlineArea inlineChildArea = (InlineArea) childArea;
- inlines.add(inlineChildArea);
- // set the parent area for the child area
- inlineChildArea.setParentArea(this);
- if (autoSize) {
- increaseIPD(inlineChildArea.getAllocIPD());
- }
+ InlineArea childArea = (InlineArea) c;
+ inlines.add(childArea);
+ // set the parent area for the child area
+ childArea.setParentArea(this);
+ if (autoSize) {
+ increaseIPD(childArea.getAllocIPD());
updateLevel ( childArea.getBidiLevel() );
}
+ int childOffset = childArea.getVirtualOffset();
+ minChildOffset = Math.min(minChildOffset, childOffset);
+ maxAfterEdge = Math.max(maxAfterEdge, childOffset + childArea.getVirtualBPD());
+ }
+
+ @Override
+ int getVirtualOffset() {
+ return getBlockProgressionOffset() + minChildOffset;
+ }
+
+ @Override
+ int getVirtualBPD() {
+ return maxAfterEdge - minChildOffset;
}
/**
Copied: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineViewport.java (from r1094916, xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineViewport.java?p2=xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineViewport.java&p1=xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java&r1=1094916&r2=1094946&rev=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineViewport.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/inline/InlineViewport.java Tue Apr 19 09:01:37 2011
@@ -121,7 +121,7 @@ public class InlineViewport extends Inli
out.writeFloat((float) contentPosition.getHeight());
}
out.writeBoolean(clip);
- out.writeObject(props);
+ out.writeObject(traits);
out.writeObject(content);
}
@@ -134,7 +134,7 @@ public class InlineViewport extends Inli
in.readFloat());
}
this.clip = in.readBoolean();
- this.props = (HashMap) in.readObject();
+ this.traits = (HashMap) in.readObject();
this.content = (Area) in.readObject();
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/FObjMixed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/FObjMixed.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/FObjMixed.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/FObjMixed.java Tue Apr 19 09:01:37 2011
@@ -50,6 +50,7 @@ public abstract class FObjMixed extends
}
/** {@inheritDoc} */
+ @Override
protected void characters(char[] data, int start, int length,
PropertyList pList,
Locator locator) throws FOPException {
@@ -64,6 +65,7 @@ public abstract class FObjMixed extends
}
/** {@inheritDoc} */
+ @Override
protected void endOfNode() throws FOPException {
super.endOfNode();
@@ -150,6 +152,7 @@ public abstract class FObjMixed extends
}
/** {@inheritDoc} */
+ @Override
protected void addChildNode(FONode child) throws FOPException {
flushText();
@@ -169,6 +172,17 @@ public abstract class FObjMixed extends
}
/** {@inheritDoc} */
+ @Override
+ public void removeChild(FONode child) {
+ super.removeChild(child);
+ if (child == this.currentTextNode) {
+ // reset to following sibling
+ this.currentTextNode = child.siblings != null ? child.siblings[1] : null;
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override
public void finalizeNode() throws FOPException {
flushText();
@@ -183,6 +197,7 @@ public abstract class FObjMixed extends
*
* @return iterator for this object
*/
+ @Override
public CharIterator charIterator() {
return new RecursiveCharIterator(this);
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/TextDecorationMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/TextDecorationMaker.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/TextDecorationMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/TextDecorationMaker.java Tue Apr 19 09:01:37 2011
@@ -59,14 +59,16 @@ public class TextDecorationMaker extends
boolean over = false;
boolean through = false;
boolean blink = false;
- int enumValue;
+ int enumValue = -1;
for (int i = lst.size(); --i >= 0;) {
Property prop = (Property)lst.get(i);
if (prop instanceof NCnameProperty) {
prop = checkEnumValues(prop.getString());
lst.set(i, prop);
}
- enumValue = prop.getEnum();
+ if (prop != null) {
+ enumValue = prop.getEnum();
+ }
switch (enumValue) {
case Constants.EN_NONE:
if (under | over | through | blink) {
@@ -115,7 +117,7 @@ public class TextDecorationMaker extends
throw new PropertyException("Invalid combination of values");
}
default:
- throw new PropertyException("Invalid value specified: " + prop);
+ throw new PropertyException("Invalid value specified: " + p);
}
}
return listProp;
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/BFEntry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/BFEntry.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/BFEntry.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fonts/BFEntry.java Tue Apr 19 09:01:37 2011
@@ -65,8 +65,9 @@ public class BFEntry {
}
/** {@inheritDoc} */
+ @Override
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder("BFEntry: ");
sb.append ( "{ UC[" );
sb.append ( unicodeStart );
sb.append ( ',' );
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java Tue Apr 19 09:01:37 2011
@@ -346,6 +346,9 @@ public class BlockContainerLayoutManager
updateContentAreaIPDwithOverconstrainedAdjust(contentWidth);
}
+ contentRectOffsetX = 0;
+ contentRectOffsetY = 0;
+
contentRectOffsetX += fo.getCommonMarginBlock().startIndent.getValue(this);
contentRectOffsetY += fo.getCommonBorderPaddingBackground().getBorderBeforeWidth(false);
contentRectOffsetY += fo.getCommonBorderPaddingBackground().getPaddingBefore(false, this);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java Tue Apr 19 09:01:37 2011
@@ -45,7 +45,7 @@ import org.apache.fop.area.PageSequence;
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.RegionViewport;
import org.apache.fop.area.inline.Image;
-import org.apache.fop.area.inline.Viewport;
+import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.datatypes.URISpecification;
import org.apache.fop.fo.Constants;
@@ -185,7 +185,7 @@ public class ExternalDocumentLayoutManag
TraitSetter.setProducerID(imageArea, fobj.getId());
transferForeignAttributes(imageArea);
- Viewport vp = new Viewport(imageArea);
+ InlineViewport vp = new InlineViewport(imageArea);
TraitSetter.setProducerID(vp, fobj.getId());
vp.setIPD(imageSize.width);
vp.setBPD(imageSize.height);
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java Tue Apr 19 09:01:37 2011
@@ -24,7 +24,7 @@ import java.awt.Rectangle;
import java.util.List;
import org.apache.fop.area.Area;
-import org.apache.fop.area.inline.Viewport;
+import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.datatypes.LengthBase;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.flow.AbstractGraphics;
@@ -54,7 +54,7 @@ public abstract class AbstractGraphicsLa
*
* @return the viewport inline area
*/
- private Viewport getInlineArea() {
+ private InlineViewport getInlineArea() {
final AbstractGraphics fobj = (AbstractGraphics)this.fobj;
Dimension intrinsicSize = new Dimension(
fobj.getIntrinsicWidth(),
@@ -84,7 +84,7 @@ public abstract class AbstractGraphicsLa
TraitSetter.setProducerID(viewportArea, fobj.getId());
transferForeignAttributes(viewportArea);
- Viewport vp = new Viewport(viewportArea);
+ InlineViewport vp = new InlineViewport(viewportArea);
TraitSetter.addPtr(vp, fobj.getPtr()); // used for accessibility
TraitSetter.setProducerID(vp, fobj.getId());
vp.setIPD(imageLayout.getViewportSize().width);
@@ -106,7 +106,7 @@ public abstract class AbstractGraphicsLa
/** {@inheritDoc} */
public List getNextKnuthElements(LayoutContext context,
int alignment) {
- Viewport areaCurrent = getInlineArea();
+ InlineViewport areaCurrent = getInlineArea();
setCurrentArea(areaCurrent);
return super.getNextKnuthElements(context, alignment);
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java Tue Apr 19 09:01:37 2011
@@ -21,7 +21,9 @@ package org.apache.fop.layoutmgr.inline;
import org.apache.fop.area.LinkResolver;
import org.apache.fop.area.Trait;
+import org.apache.fop.area.inline.BasicLinkArea;
import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.area.inline.InlineParent;
import org.apache.fop.datatypes.URISpecification;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.BasicLink;
@@ -77,4 +79,10 @@ public class BasicLinkLayoutManager exte
}
}
}
+
+ @Override
+ protected InlineParent createInlineParent() {
+ return new BasicLinkArea();
+ }
+
}
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=1094946&r1=1094945&r2=1094946&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 Tue Apr 19 09:01:37 2011
@@ -198,13 +198,13 @@ public class InlineLayoutManager extends
/**
* Create and initialize an <code>InlineArea</code>
*
- * @param hasInlineParent true if the parent is an inline
+ * @param isInline true if the parent is an inline
* @return the area
*/
- protected InlineArea createArea(boolean hasInlineParent) {
+ protected InlineArea createArea(boolean isInline) {
InlineArea area;
- if (hasInlineParent) {
- area = new InlineParent();
+ if (isInline) {
+ area = createInlineParent();
area.setBlockProgressionOffset(0);
} else {
area = new InlineBlockParent();
@@ -215,6 +215,16 @@ public class InlineLayoutManager extends
return area;
}
+ /**
+ * Creates the inline area that will contain the areas returned by the
+ * children of this layout manager.
+ *
+ * @return a new inline area
+ */
+ protected InlineParent createInlineParent() {
+ return new InlineParent();
+ }
+
/** {@inheritDoc} */
@Override
protected void setTraits(boolean isNotFirst, boolean isNotLast) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Tue Apr 19 09:01:37 2011
@@ -27,6 +27,7 @@ import java.util.ListIterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.area.Area;
import org.apache.fop.area.LineArea;
import org.apache.fop.area.Trait;
@@ -157,7 +158,7 @@ public class LineLayoutManager extends I
private final int follow;
private AlignmentContext alignmentContext;
- private List knuthParagraphs;
+ private List<KnuthSequence> knuthParagraphs;
private LineLayoutPossibilities lineLayouts;
private LineLayoutPossibilities[] lineLayoutsList;
@@ -402,7 +403,7 @@ public class LineLayoutManager extends I
// true if this line contains only zero-height, auxiliary boxes
// and the actual line width is 0; in this case, the line "collapses"
// i.e. the line area will have bpd = 0
- boolean bZeroHeightLine = (difference == ipd);
+ boolean isZeroHeightLine = (difference == ipd);
// if line-stacking-strategy is "font-height", the line height
// is not affected by its content
@@ -438,9 +439,9 @@ public class LineLayoutManager extends I
}
lastAC = ac;
}
- if (bZeroHeightLine
+ if (isZeroHeightLine
&& (!element.isAuxiliary() || ac != null && ac.getHeight() > 0)) {
- bZeroHeightLine = false;
+ isZeroHeightLine = false;
}
}
}
@@ -452,7 +453,7 @@ public class LineLayoutManager extends I
constantLineHeight = lineLead + lineFollow;
- if (bZeroHeightLine) {
+ if (isZeroHeightLine) {
return new LineBreakPosition(thisLLM,
knuthParagraphs.indexOf(par),
firstElementIndex, lastElementIndex,
@@ -583,7 +584,7 @@ public class LineLayoutManager extends I
//PHASE 1: Create Knuth elements
if (knuthParagraphs == null) {
// it's the first time this method is called
- knuthParagraphs = new ArrayList();
+ knuthParagraphs = new ArrayList<KnuthSequence>();
// here starts Knuth's algorithm
collectInlineKnuthElements(context);
@@ -615,12 +616,10 @@ public class LineLayoutManager extends I
LeafPosition restartPosition) {
log.trace("Restarting line breaking from index " + restartPosition.getIndex());
int parIndex = restartPosition.getLeafPos();
- Paragraph paragraph = (Paragraph) knuthParagraphs.get(parIndex);
- for (int i = 0; i <= restartPosition.getIndex(); i++) {
- paragraph.remove(0);
- }
- Iterator iter = paragraph.iterator();
- while (iter.hasNext() && !((KnuthElement) iter.next()).isBox()) {
+ KnuthSequence paragraph = knuthParagraphs.get(parIndex);
+ paragraph.subList(0, restartPosition.getIndex() + 1).clear();
+ Iterator<KnuthElement> iter = paragraph.iterator();
+ while (iter.hasNext() && !iter.next().isBox()) {
iter.remove();
}
if (!iter.hasNext()) {
@@ -653,8 +652,8 @@ public class LineLayoutManager extends I
Paragraph lastPar = null;
- InlineLevelLayoutManager curLM;
- while ((curLM = (InlineLevelLayoutManager) getChildLM()) != null) {
+ InlineLevelLayoutManager curLM = (InlineLevelLayoutManager) getChildLM();
+ while (curLM != null) {
List inlineElements = curLM.getNextKnuthElements(inlineLC, effectiveAlignment);
if (inlineElements == null || inlineElements.size() == 0) {
/* curLM.getNextKnuthElements() returned null or an empty list;
@@ -751,7 +750,9 @@ public class LineLayoutManager extends I
}
}
} // end of loop over returnedList
+ curLM = (InlineLevelLayoutManager) getChildLM();
}
+
if (lastPar != null) {
lastPar.endParagraph();
ElementListObserver.observe(lastPar, "line", fobj.getId());
@@ -768,13 +769,13 @@ public class LineLayoutManager extends I
* @param context the layout context
* @return a list of Knuth elements representing broken lines
*/
- private List createLineBreaks(int alignment, LayoutContext context) {
+ private List<ListElement> createLineBreaks(int alignment, LayoutContext context) {
// find the optimal line breaking points for each paragraph
- Iterator paragraphsIterator = knuthParagraphs.iterator();
+ Iterator<KnuthSequence> paragraphsIterator = knuthParagraphs.iterator();
lineLayoutsList = new LineLayoutPossibilities[knuthParagraphs.size()];
LineLayoutPossibilities llPoss;
for (int i = 0; paragraphsIterator.hasNext(); i++) {
- KnuthSequence seq = (KnuthSequence) paragraphsIterator.next();
+ KnuthSequence seq = paragraphsIterator.next();
if (!seq.isInlineSequence()) {
// This set of line layout possibilities does not matter;
// we only need an entry in lineLayoutsList.
@@ -810,7 +811,7 @@ public class LineLayoutManager extends I
lineHeight.getValue(this), lead, follow,
(knuthParagraphs.indexOf(currPar) == 0),
hyphenationLadderCount.getEnum() == EN_NO_LIMIT
- ? 0 : hyphenationLadderCount.getValue(),
+ ? 0 : hyphenationLadderCount.getValue(),
this);
alg.setConstantLineWidth(ipd);
boolean canWrap = (wrapOption != EN_NO_WRAP);
@@ -876,7 +877,7 @@ public class LineLayoutManager extends I
* @param context the layout context
* @return the newly built element list
*/
- private List postProcessLineBreaks(int alignment, LayoutContext context) {
+ private List<ListElement> postProcessLineBreaks(int alignment, LayoutContext context) {
List<ListElement> returnList = new LinkedList<ListElement>();
@@ -893,7 +894,7 @@ public class LineLayoutManager extends I
}
LineLayoutPossibilities llPoss = lineLayoutsList[p];
- KnuthSequence seq = (KnuthSequence) knuthParagraphs.get(p);
+ KnuthSequence seq = knuthParagraphs.get(p);
if (!seq.isInlineSequence()) {
List<ListElement> targetList = new LinkedList<ListElement>();
@@ -1152,7 +1153,7 @@ public class LineLayoutManager extends I
/** {@inheritDoc} */
public List getChangedKnuthElements(List oldList, int alignment) {
- List returnList = new LinkedList();
+ List<KnuthElement> returnList = new LinkedList<KnuthElement>();
for (int p = 0; p < knuthParagraphs.size(); p++) {
LineLayoutPossibilities llPoss = lineLayoutsList[p];
//log.debug("demerits of the chosen layout: " + llPoss.getChosenDemerits());
@@ -1395,7 +1396,7 @@ public class LineLayoutManager extends I
public void addAreas(PositionIterator parentIter,
LayoutContext context) {
while (parentIter.hasNext()) {
- Position pos = (Position) parentIter.next();
+ Position pos = parentIter.next();
boolean isLastPosition = !parentIter.hasNext();
if (pos instanceof LineBreakPosition) {
addInlineArea(context, (LineBreakPosition) pos, isLastPosition);
@@ -1429,13 +1430,13 @@ public class LineLayoutManager extends I
(lbp.getLeafPos() < seq.size() - 1 ? textAlignment : textAlignmentLast),
lbp.difference, lbp.availableStretch, lbp.availableShrink);
if (lbp.startIndent != 0) {
- lineArea.addTrait(Trait.START_INDENT, new Integer(lbp.startIndent));
+ lineArea.addTrait(Trait.START_INDENT, lbp.startIndent);
}
lineArea.setBPD(lbp.lineHeight);
lineArea.setIPD(lbp.lineWidth);
lineArea.setBidiLevel(bidiLevel);
- lineArea.addTrait(Trait.SPACE_BEFORE, new Integer(lbp.spaceBefore));
- lineArea.addTrait(Trait.SPACE_AFTER, new Integer(lbp.spaceAfter));
+ lineArea.addTrait(Trait.SPACE_BEFORE, lbp.spaceBefore);
+ lineArea.addTrait(Trait.SPACE_AFTER, lbp.spaceAfter);
alignmentContext.resizeLine(lbp.lineHeight, lbp.baseline);
if (seq instanceof Paragraph) {
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Tue Apr 19 09:01:37 2011
@@ -553,12 +553,8 @@ public class TableCellLayoutManager exte
/** {@inheritDoc} */
public Keep getKeepTogether() {
- Keep keep = Keep.KEEP_AUTO;
- if (primaryGridUnit.getRow() != null) {
- keep = Keep.getKeep(primaryGridUnit.getRow().getKeepTogether());
- }
- keep = keep.compare(getParentKeepTogether());
- return keep;
+ // keep-together does not apply to fo:table-cell
+ return Keep.KEEP_AUTO;
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableStepper.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableStepper.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableStepper.java Tue Apr 19 09:01:37 2011
@@ -239,7 +239,7 @@ public class TableStepper {
}
}
- Keep keep = Keep.KEEP_AUTO;
+ Keep keep = getTableLM().getKeepTogether();
int stepPenalty = 0;
for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
ActiveCell activeCell = (ActiveCell) iter.next();
@@ -248,8 +248,6 @@ public class TableStepper {
}
if (!rowFinished) {
keep = keep.compare(rowGroup[activeRowIndex].getKeepTogether());
- //The above call doesn't take the penalty from the table into account, so...
- keep = keep.compare(getTableLM().getKeepTogether());
} else if (activeRowIndex < rowGroup.length - 1) {
keep = keep.compare(rowGroup[activeRowIndex].getKeepWithNext());
keep = keep.compare(rowGroup[activeRowIndex + 1].getKeepWithPrevious());
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java Tue Apr 19 09:01:37 2011
@@ -44,7 +44,7 @@ import org.apache.fop.area.RegionViewpor
import org.apache.fop.area.Trait;
import org.apache.fop.area.inline.ForeignObject;
import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.area.inline.Viewport;
+import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.fonts.FontMetrics;
@@ -542,7 +542,7 @@ public abstract class AbstractPathOrient
}
//Clipping
- if (bv.getClip()) {
+ if (bv.hasClip()) {
clipRect(0f, 0f, width, height);
}
@@ -593,8 +593,8 @@ public abstract class AbstractPathOrient
//Now adjust for border/padding
currentBPPosition += borderPaddingBefore;
- Rectangle2D clippingRect = null;
- if (bv.getClip()) {
+ Rectangle clippingRect = null;
+ if (bv.hasClip()) {
clippingRect = new Rectangle(currentIPPosition, currentBPPosition,
bv.getIPD(), bv.getBPD());
}
@@ -685,7 +685,7 @@ public abstract class AbstractPathOrient
* This renders an inline viewport by clipping if necessary.
* @param viewport the viewport to handle
*/
- public void renderViewport(Viewport viewport) {
+ public void renderInlineViewport(InlineViewport viewport) {
float x = currentIPPosition / 1000f;
float y = (currentBPPosition + viewport.getBlockProgressionOffset()) / 1000f;
@@ -701,14 +701,14 @@ public abstract class AbstractPathOrient
drawBackAndBorders(viewport, x, y, width + bpwidth, height + bpheight);
- if (viewport.getClip()) {
+ if (viewport.hasClip()) {
saveGraphicsState();
clipRect(x + borderPaddingStart, y + borderPaddingBefore, width, height);
}
- super.renderViewport(viewport);
+ super.renderInlineViewport(viewport);
- if (viewport.getClip()) {
+ if (viewport.hasClip()) {
restoreGraphicsState();
}
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractRenderer.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/AbstractRenderer.java Tue Apr 19 09:01:37 2011
@@ -65,7 +65,7 @@ import org.apache.fop.area.inline.Leader
import org.apache.fop.area.inline.Space;
import org.apache.fop.area.inline.SpaceArea;
import org.apache.fop.area.inline.TextArea;
-import org.apache.fop.area.inline.Viewport;
+import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.fo.Constants;
import org.apache.fop.fonts.FontInfo;
@@ -278,7 +278,6 @@ public abstract class AbstractRenderer
* @param port The region viewport to be rendered
*/
protected void renderRegionViewport(RegionViewport port) {
- Rectangle2D view = port.getViewArea();
// The CTM will transform coordinates relative to
// this region-reference area into page coords, so
// set origin for the region to 0,0.
@@ -289,7 +288,7 @@ public abstract class AbstractRenderer
handleRegionTraits(port);
// shouldn't the viewport have the CTM
- startVParea(regionReference.getCTM(), port.isClip() ? view : null);
+ startVParea(regionReference.getCTM(), port.getClipRectangle());
// do after starting viewport area
if (regionReference.getRegionClass() == FO_REGION_BODY) {
renderBodyRegion((BodyRegion) regionReference);
@@ -306,7 +305,7 @@ public abstract class AbstractRenderer
* @param clippingRect the clipping rectangle if the viewport should be clipping,
* null if no clipping is performed.
*/
- protected abstract void startVParea(CTM ctm, Rectangle2D clippingRect);
+ protected abstract void startVParea(CTM ctm, Rectangle clippingRect);
/**
* Signals exit from a viewport area. Subclasses can restore transformation matrices
@@ -461,8 +460,8 @@ public abstract class AbstractRenderer
int saveIP = currentIPPosition;
int saveBP = currentBPPosition;
- Rectangle2D clippingRect = null;
- if (bv.getClip()) {
+ Rectangle clippingRect = null;
+ if (bv.hasClip()) {
clippingRect = new Rectangle(saveIP, saveBP, bv.getIPD(), bv.getBPD());
}
@@ -632,8 +631,8 @@ public abstract class AbstractRenderer
renderInlineBlockParent((InlineBlockParent) inlineArea);
} else if (inlineArea instanceof Space) {
renderInlineSpace((Space) inlineArea);
- } else if (inlineArea instanceof Viewport) {
- renderViewport((Viewport) inlineArea);
+ } else if (inlineArea instanceof InlineViewport) {
+ renderInlineViewport((InlineViewport) inlineArea);
} else if (inlineArea instanceof Leader) {
renderLeader((Leader) inlineArea);
}
@@ -736,7 +735,7 @@ public abstract class AbstractRenderer
* Render the given Viewport.
* @param viewport the viewport to render
*/
- protected void renderViewport(Viewport viewport) {
+ protected void renderInlineViewport(InlineViewport viewport) {
Area content = viewport.getContent();
int saveBP = currentBPPosition;
currentBPPosition += viewport.getBlockProgressionOffset();
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFConstants.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFConstants.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFConstants.java Tue Apr 19 09:01:37 2011
@@ -67,6 +67,8 @@ public interface IFConstants extends XML
String EL_FONT = "font";
/** element name text */
String EL_TEXT = "text";
+ /** element name id */
+ String EL_ID = "id";
/** Parent element of the logical structure tree. */
String EL_STRUCTURE_TREE = "structure-tree";
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFContext.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFContext.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFContext.java Tue Apr 19 09:01:37 2011
@@ -48,6 +48,8 @@ public class IFContext {
private String structurePointer;
+ private String id = "";
+
/**
* Main constructor.
* @param ua the user agent
@@ -155,4 +157,23 @@ public class IFContext {
return this.structurePointer;
}
+ /**
+ * Sets the ID of the object enclosing the content that will follow.
+ *
+ * @param id the ID of the nearest ancestor object for which the id property was set
+ */
+ void setID(String id) {
+ assert id != null;
+ this.id = id;
+ }
+
+ /**
+ * Returns the ID of the object enclosing the current content.
+ *
+ * @return the ID of the nearest ancestor object for which the id property was set
+ */
+ String getID() {
+ return id;
+ }
+
}
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFParser.java?rev=1094946&r1=1094945&r2=1094946&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFParser.java (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/render/intermediate/IFParser.java Tue Apr 19 09:01:37 2011
@@ -24,6 +24,7 @@ import java.awt.Dimension;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -76,7 +77,7 @@ public class IFParser implements IFConst
private static SAXTransformerFactory tFactory
= (SAXTransformerFactory)SAXTransformerFactory.newInstance();
- private static Set handledNamespaces = new java.util.HashSet();
+ private static Set<String> handledNamespaces = new java.util.HashSet<String>();
static {
handledNamespaces.add(XMLNS_NAMESPACE_URI);
@@ -132,7 +133,7 @@ public class IFParser implements IFConst
private static class Handler extends DefaultHandler {
- private Map elementHandlers = new java.util.HashMap();
+ private Map<String, ElementHandler> elementHandlers = new HashMap<String, ElementHandler>();
private IFDocumentHandler documentHandler;
private IFPainter painter;
@@ -188,6 +189,7 @@ public class IFParser implements IFConst
//Page content
elementHandlers.put(EL_VIEWPORT, new ViewportHandler());
elementHandlers.put(EL_GROUP, new GroupHandler());
+ elementHandlers.put(EL_ID, new IDHandler());
elementHandlers.put(EL_FONT, new FontHandler());
elementHandlers.put(EL_TEXT, new TextHandler());
elementHandlers.put(EL_CLIP_RECT, new ClipRectHandler());
@@ -202,7 +204,7 @@ public class IFParser implements IFConst
}
}
- private void establishForeignAttributes(Map foreignAttributes) {
+ private void establishForeignAttributes(Map<QName, String> foreignAttributes) {
documentHandler.getContext().setForeignAttributes(foreignAttributes);
}
@@ -300,7 +302,7 @@ public class IFParser implements IFConst
private boolean startIFElement(String localName, Attributes attributes)
throws SAXException {
lastAttributes = new AttributesImpl(attributes);
- ElementHandler elementHandler = (ElementHandler)elementHandlers.get(localName);
+ ElementHandler elementHandler = elementHandlers.get(localName);
content.setLength(0);
ignoreCharacters = true;
if (elementHandler != null) {
@@ -346,7 +348,7 @@ public class IFParser implements IFConst
}
} else {
if (NAMESPACE.equals(uri)) {
- ElementHandler elementHandler = (ElementHandler)elementHandlers.get(localName);
+ ElementHandler elementHandler = elementHandlers.get(localName);
if (elementHandler != null) {
try {
elementHandler.endElement();
@@ -432,7 +434,7 @@ public class IFParser implements IFConst
documentHandler.getContext().setLanguage(
XMLUtil.convertRFC3066ToLocale(xmllang));
}
- Map foreignAttributes = getForeignAttributes(lastAttributes);
+ Map<QName, String> foreignAttributes = getForeignAttributes(lastAttributes);
establishForeignAttributes(foreignAttributes);
documentHandler.startPageSequence(id);
resetForeignAttributes();
@@ -453,7 +455,7 @@ public class IFParser implements IFConst
String pageMasterName = attributes.getValue("page-master-name");
int width = Integer.parseInt(attributes.getValue("width"));
int height = Integer.parseInt(attributes.getValue("height"));
- Map foreignAttributes = getForeignAttributes(lastAttributes);
+ Map<QName, String> foreignAttributes = getForeignAttributes(lastAttributes);
establishForeignAttributes(foreignAttributes);
documentHandler.startPage(index, name, pageMasterName,
new Dimension(width, height));
@@ -486,6 +488,7 @@ public class IFParser implements IFConst
public void endElement() throws IFException {
painter = null;
+ documentHandler.getContext().setID("");
documentHandler.endPageContent();
}
@@ -536,6 +539,16 @@ public class IFParser implements IFConst
}
+ private class IDHandler extends AbstractElementHandler {
+
+ @Override
+ public void startElement(Attributes attributes) throws IFException, SAXException {
+ String id = attributes.getValue("name");
+ documentHandler.getContext().setID(id);
+ }
+
+ }
+
private class FontHandler extends AbstractElementHandler {
public void startElement(Attributes attributes) throws IFException {
@@ -666,7 +679,7 @@ public class IFParser implements IFConst
int y = Integer.parseInt(lastAttributes.getValue("y"));
int width = Integer.parseInt(lastAttributes.getValue("width"));
int height = Integer.parseInt(lastAttributes.getValue("height"));
- Map foreignAttributes = getForeignAttributes(lastAttributes);
+ Map<QName, String> foreignAttributes = getForeignAttributes(lastAttributes);
establishForeignAttributes(foreignAttributes);
setStructurePointer(lastAttributes);
if (foreignObject != null) {
@@ -718,8 +731,8 @@ public class IFParser implements IFConst
}
}
- private static Map getForeignAttributes(Attributes atts) {
- Map foreignAttributes = null;
+ private static Map<QName, String> getForeignAttributes(Attributes atts) {
+ Map<QName, String> foreignAttributes = null;
for (int i = 0, c = atts.getLength(); i < c; i++) {
String ns = atts.getURI(i);
if (ns.length() > 0) {
@@ -727,7 +740,7 @@ public class IFParser implements IFConst
continue;
}
if (foreignAttributes == null) {
- foreignAttributes = new java.util.HashMap();
+ foreignAttributes = new java.util.HashMap<QName, String>();
}
QName qname = new QName(ns, atts.getQName(i));
foreignAttributes.put(qname, atts.getValue(i));
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org