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 vh...@apache.org on 2012/04/13 18:49:38 UTC
svn commit: r1325839 [1/2] - in
/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript: ./
examples/embedding/java/embedding/ src/documentation/
src/documentation/content/xdocs/ src/documentation/content/xdocs/dev/
src/documentation/content/xdocs/trunk/ s...
Author: vhennebert
Date: Fri Apr 13 16:49:35 2012
New Revision: 1325839
URL: http://svn.apache.org/viewvc?rev=1325839&view=rev
Log:
Merged changes from trunk up to rev. 1325806
Added:
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPS.java
- copied unchanged from r1325837, xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleEPS.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/examples/embedding/java/embedding/ExampleEPSSimple.java
- copied unchanged from r1325837, xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleEPSSimple.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/complexscripts.xml
- copied unchanged from r1325837, xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/complexscripts.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphBreak.java
- copied unchanged from r1325837, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphBreak.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/footnote_bug53005.xml
- copied unchanged from r1325837, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_bug53005.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/markers_9.xml
- copied unchanged from r1325837, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_9.xml
Modified:
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/ (props changed)
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/KEYS
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.js
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/dev/release.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/site.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/running.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/skinconf.xml
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPResourceLevel.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/apps/ (props changed)
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/AFPFont.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageObject.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/parser/ (props changed)
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Area.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeObject.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/BodyRegion.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Page.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/PageViewport.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionReference.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionViewport.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineViewport.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/Event.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/EventFormatter.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FONode.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Inline.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Marker.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/properties/PropertyCache.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fonts/FontInfo.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/CharVector.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/hyphenation/TernaryTree.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPCustomizable.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/awt/AWTRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/ps/NativeTextHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/tools/anttasks/FileCompare.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/ColorExt.java (props changed)
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/util/XMLResourceBundle.java
xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/status.xml
Propchange: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/trunk:r1307576-1325837
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/KEYS
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/KEYS?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/KEYS (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/KEYS Fri Apr 13 16:49:35 2012
@@ -246,3 +246,39 @@ tWcUInqOwhLX896WaH9Y5NJYe98MNpQxr3wizYOw
Jysr6rop4tOTfXLTX7m5hXkfJ/k=
=soRW
-----END PGP PUBLIC KEY BLOCK-----
+pub 2048R/0ED3D317 2012-04-09 [expires: 2017-04-08]
+uid Glenn Adams <ga...@apache.org>
+sig 3 0ED3D317 2012-04-09 Glenn Adams <ga...@apache.org>
+sub 2048R/F23E86C1 2012-04-09 [expires: 2017-04-08]
+sig 0ED3D317 2012-04-09 Glenn Adams <ga...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (Darwin)
+
+mQENBE+DFvEBCACwHesM5hkZrlgPiq588FbZPe7QGtDRVdh0YbgI2A4Ky2odbFmA
+/n7lF9v+yf+FUn/0H2igwDYqLFx4JsB7z+Nvj+hwExdGQxuDaGSwMjjpJeEiuEmf
+b1Er5KYgpeFNm1MVP+r5kW5962O+HGIEx1xQ85AskNbr/jQkAg/wbbwWLFBQRMER
+PqFs1rXL2aWip8XtNPKnKBLPlFPn9a7glgB5Whgbls44KpR0dplAVoCWMnZEYnTA
+JYITcaDTCGFQI7aYgbj986RpS80o/Wcsnb8rjHKRZG8TaDr9MbgmmK39KwiJCflJ
+9LvXR9g1j3addxgqEUuQBEtoLkWs/eDT/KQ7ABEBAAG0H0dsZW5uIEFkYW1zIDxn
+YWRhbXNAYXBhY2hlLm9yZz6JAT4EEwECACgFAk+DFvECGwMFCQlmAYAGCwkIBwMC
+BhUIAgkKCwQWAgMBAh4BAheAAAoJEGZUur4O09MXl7MH/jfeyE012/ABTTjvwvRw
+2evD3cfghrZOQVT3PVEcVnXIcnVlmznO2DDs8aWXlhJ94ZnNdw8iKE8weK1FGXdd
+qWA7vHrOI1UAo7h+CDaBt0TM6OEM3Mp3+5baOJMRXyrjhbv74sj88HYRtoPhA2+z
+5ilVNmmX4PEAc6wqt87ZfNQ2ZqX2YzR+OaT5OggSB12qU/uE7d4d0NcDozEKQFUP
+CMAuPJRNd4/J5yFy0DStfgsDKuUTir0oldlUElAjbhF8WtAgRwufIYuG/r4Cbuid
+Qc32yVAoy069ZcggwBpkzVPOpL2by1fzeSohjIkntDIL474KuSSoBKCuw2nYxpyw
+b0O5AQ0ET4MW8QEIAMFUAScm2Dw1fmBhmKMVc0mzqpR8TvSQvwJLiXRSP86NI1zc
+DtuiXCFfNZykOifFk50otMH1hd91hqeQ6HfsxxYtXLg2UDHG2gTKzlWefwA+1eFc
+M8fz/oV0CanGjqaOd6VZoYeg+LSD6YgrJZVjuoxNN/S0A9fNd8B3CXsG+92udkkW
+YMyiUpD5qjMEwcjmj6ITX3M9VLxDCKKhYwN+u5wokuAk3yKtvBpWhJDQbaJcuDaC
+rLH788gFybZDzyJ8Ug/95peV9Z57OCjMJLtn67ES7fB544EQRYVmDGnX5tTo9sYj
+0bDjlbKX9lqS1sCGSezPxYxGgeXlnQrt+Sm+gd0AEQEAAYkBJQQYAQIADwUCT4MW
+8QIbDAUJCWYBgAAKCRBmVLq+DtPTF2YbB/0Vo8Xr9N1adqlY1UAofvo5AoXZFxFJ
+jkB0Eb3z1V3iSBh8P921LD0gUQz6JXptXZPVGnwgm/44RdqXC+kX+4MxiVBtNAHp
+0ODjIXiabBrixAHnT7EcAJkWue0RP2J5wiYKklwWFbEetjl0QSmitz8Jh33eA76j
+kFYW+vgKUMA8UrJ6j2Hk+vMFi0Odtntbc7AXvLifSPSmSztNe/Mws69EbuBph6bQ
++zSmTQ6nt8PX+v3e0PnkXdGD8si9H6hj0K32pEMz86ttSnAtrhvsAdKPYOkY7/JD
+0Bl+bnb7FLxJjJGlGuO/Rn5SIR3fFNQGrE/zl2wsKtftUXse6kkZSue+
+=XDBB
+-----END PGP PUBLIC KEY BLOCK-----
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/findbugs-exclude.xml Fri Apr 13 16:49:35 2012
@@ -189,66 +189,11 @@
</Match>
<!-- Automatically generated list of exclusions -->
<Match>
- <Class name="org.apache.fop.area.BodyRegion"/>
- <Method name="clone"/>
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.area.Page"/>
- <Method name="clone"/>
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.area.PageViewport"/>
- <Method name="clone"/>
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.area.RegionReference"/>
- <Method name="clone"/>
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.area.BodyRegion"/>
- <!--Neither method nor field-->
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.area.RegionViewport"/>
- <Method name="clone"/>
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.hyphenation.CharVector"/>
- <Method name="clone"/>
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.hyphenation.TernaryTree"/>
- <Method name="clone"/>
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.hyphenation.HyphenationTree"/>
- <!--Neither method nor field-->
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
<Class name="org.apache.fop.render.intermediate.IFGraphicContext"/>
<Method name="clone"/>
<Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
</Match>
<Match>
- <Class name="org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes"/>
- <Method name="clone"/>
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
- <Class name="org.apache.fop.render.rtf.FOPRtfAttributes"/>
- <!--Neither method nor field-->
- <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
- </Match>
- <Match>
<Class name="org.apache.fop.hyphenation.Hyphenator"/>
<Method name="getResourceStream"/>
<Bug pattern="DE_MIGHT_IGNORE"/>
@@ -4394,11 +4339,6 @@
<Bug pattern="RI_REDUNDANT_INTERFACES"/>
</Match>
<Match>
- <Class name="java.lang.Cloneable"/>
- <!--Neither method nor field-->
- <Bug pattern="RI_REDUNDANT_INTERFACES"/>
- </Match>
- <Match>
<Class name="org.apache.fop.afp.modca.AbstractResourceGroupContainer"/>
<!--Neither method nor field-->
<Bug pattern="RI_REDUNDANT_INTERFACES"/>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop Fri Apr 13 16:49:35 2012
@@ -18,6 +18,7 @@
# Shell script to run FOP, adapted from the Jakarta-Ant project.
rpm_mode=true
+java_exec_args="-Djava.awt.headless=true"
fop_exec_args=
no_config=false
fop_exec_debug=false
@@ -247,7 +248,7 @@ fi
# Execute FOP using eval/exec to preserve spaces in paths,
# java options, and FOP args
-fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
+fop_exec_command="exec \"$JAVACMD\" $java_exec_args $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
if $fop_exec_debug ; then
echo $fop_exec_command
fi
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.bat Fri Apr 13 16:49:35 2012
@@ -58,7 +58,7 @@ set LIBDIR=%LOCAL_FOP_HOME%lib
set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
-set JAVAOPTS=-Denv.windir=%WINDIR%
+set JAVAOPTS=-Denv.windir=%WINDIR% -Djava.awt.headless=true
if "%JAVA_HOME%" == "" goto noJavaHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.js
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.js?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.js (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/fop.js Fri Apr 13 16:49:35 2012
@@ -18,6 +18,7 @@
// rpm_mode is irrelevant on Windows
// var rpm_mode=true;
+var java_exec_args = "-Djava.awt.headless=true";
var fop_exec_args = "";
var no_config=false;
var fop_exec_debug=false;
@@ -62,6 +63,7 @@ function read_args() {
WScript.Echo("keepopen: " + keep_open);
WScript.Echo("noconfig: " + no_config);
WScript.Echo("help: " + show_help);
+ WScript.Echo("java arguments: " + java_exec_args);
WScript.Echo("fop arguments: " + fop_exec_args);
}
}
@@ -220,6 +222,7 @@ function get_local_classpath() {
// Execute fop via shell.Exec
function fop_exec() {
var fop_exec_command = "\"" + javacmd + "\" "
+ + java_exec_args + " "
+ (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")
+ (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")
+ (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")
@@ -252,6 +255,7 @@ function fop_exec() {
function fop_run() {
var fop_exec_command = "cmd /" + (keep_open?"K":"C") + " \""
+ "\"" + javacmd + "\" "
+ + java_exec_args + " "
+ (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")
+ (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")
+ (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/compliance.ihtml Fri Apr 13 16:49:35 2012
@@ -3842,10 +3842,10 @@
"http://www.w3.org/TR/xsl/#page-height">§7.27.13</a></td>
<td><a name="fo-property-page-height" id="fo-property-page-height">page-height</a></td>
<td class="basic">Basic</td>
- <td class="yes">yes</td>
- <td class="yes">yes</td>
- <td class="yes">yes</td>
- <td> </td>
+ <td class="partial">partial</td>
+ <td class="partial">partial</td>
+ <td class="partial">partial</td>
+ <td>value "indefinite" not yet supported</td>
</tr>
<tr>
<td align="center"><a href=
@@ -3862,10 +3862,10 @@
"http://www.w3.org/TR/xsl/#page-width">§7.27.15</a></td>
<td><a name="fo-property-page-width" id="fo-property-page-width">page-width</a></td>
<td class="basic">Basic</td>
- <td class="yes">yes</td>
- <td class="yes">yes</td>
- <td class="yes">yes</td>
- <td> </td>
+ <td class="partial">partial</td>
+ <td class="partial">partial</td>
+ <td class="partial">partial</td>
+ <td>value "indefinite" not yet supported</td>
</tr>
<tr>
<td align="center"><a href=
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/dev/release.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/dev/release.xml?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/dev/release.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/dev/release.xml Fri Apr 13 16:49:35 2012
@@ -25,100 +25,72 @@
<body>
<section id="intro">
<title>Introduction</title>
- <p>This page documents the process of creating a Apache⢠FOP release.
-FOP releases are coordinated by one member of the team (currently Christian Geisert), so others do not ordinarily need to use this information.
-The purpose of documenting it here is to facilitate consistency, ensure that the process is captured, and to allow others to comment on the process.</p>
- <p>The checklist below was assembled from Christian Geisert's notes. It will be expanded in the future as he has time.</p>
+ <p>This page documents the process of creating a Apache⢠FOP release. FOP releases are coordinated by some designated member of the team.
+ The purpose of documenting it here is to facilitate consistency, ensure that the process is captured, and to allow others to comment on the process.</p>
+ <p>The checklist below is based on a combination of input from from Christian Geisert and Simon Pepping.</p>
</section>
<section id="checklist">
<title>Checklist</title>
<ul>
+ <li>Determine which open bugs must be solved before a release can take place (release critical bugs).
+ Make this bug depend on each release critical bug and write a short argument why the bug is release critical.</li>
<li>Determine whether this is a Release Candidate or a Release.</li>
<li>Determine whether further testing is required.</li>
<li>Commit any outstanding changes</li>
<li>Create a branch called <code>branches/fop-v_vv</code></li>
- <li>Edit release notes (<code>README</code> and
- <code>status.xml</code> in the root).</li>
- <li>Add the release to <code>news-data.xml</code>;
- remove links to release notes of older versions from this file.</li>
- <li>Update the FAQ (<code>faq.xml</code>) to the new release.</li>
- <li>Check and update the copyright year in NOTICE and build.xml.</li>
+ <li>Edit release notes (<code>README</code> and <code>status.xml</code> in the root).</li>
+ <li>Add the release to <code>news-data.xml</code>;
+ remove links to release notes of older versions from this file.</li>
+ <li>Update the FAQ (<code>faq.xml</code>) to the new release, e.g., update the answer for "When is the next release planned?".</li>
+ <li>Check and update the copyright year in NOTICE and build.xml.</li>
<li>Update the file <code>doap.rdf</code>, and the files
<code>index.xml</code>, <code>site.xml</code>,
<code>download.xml</code>, <code>fo.xml</code>,
- <code>maillist.xml</code>, <code>quickstartguide.xml</code>,
- <code>faq.xml</code> and <code>status.xml</code>
+ <code>maillist.xml</code>, and <code>quickstartguide.xml</code>
in directory <code>xdocs</code> for the new version.</li>
<li>Update the version numbers in the release column on the
compliance page (<code>compliance.xml</code>); update the compliance in the release column
to the current state (development column).</li>
<li>Update version number in <code>build.xml</code> (not to be merged back
into trunk).</li>
- <li>Copy trunk documentation directory to a new directory with
- the new version number, and update the .htaccess file for
- redirections.</li>
- <li>Copy <code>test/fotree/disabled-testcases.xml</code> and
- <code>test/layoutengine/disabled-testcases.xml</code> to the
- new version directory
- <code><version>/fotree/disabled-testcases.xml</code> and
- <code><version>/layoutengine/disabled-testcases.xml</code>.
- Copy <code>known-issues.xml</code> to the new version
- directory. Copy <code>knownissues-overview.xml</code> from the
- current to the new version directory, and update the <code>xi:include</code>
- links in it.</li>
- <li>Update the tab names and directories in tabs.xml</li>
+ <li>Copy trunk documentation directory to a new directory with the new version number, and update the <code>.htaccess</code> file for
+ redirections.</li>
+ <li>Copy <code>test/fotree/disabled-testcases.xml</code> and <code>test/layoutengine/disabled-testcases.xml</code> to the
+ new version directory <code><version>/fotree/disabled-testcases.xml</code> and <code><version>/layoutengine/disabled-testcases.xml</code>.
+ Copy <code>known-issues.xml</code> to the new version directory. Copy <code>knownissues-overview.xml</code> from the
+ current to the new version directory, and update the <code>xi:include</code> links in it.</li>
+ <li>Update the tab names and directories in <code>tabs.xml</code></li>
<li>Delete the previous version directory.</li>
- <li>Update index.xml in the new version directory.</li>
- <li>Update compiling.xml in the new version directory: change the intro for trunk to that for a release.</li>
- <li>Build the dist files (<code>build[.sh] dist</code>)
- and upload them to your web directory on
- <code>people.apache.org</code></li>
- <li>Ask on fop-dev to check the branch and the generated dist
- files for errors.</li>
+ <li>Update <code>index.xml</code> in the new version directory.</li>
+ <li>Update <code>compiling.xml</code> in the new version directory: change the introduction for trunk to that for a release.</li>
+ <li>Build the dist files (<code>build[.sh] dist</code>) and upload them to your web directory on <code>people.apache.org</code></li>
+ <li>Ask on <code>fop-dev</code> ML to check the branch and the generated dist files for errors.</li>
<li>Tag the source tree with the release ID. For example, if the release is 1.0:
<code>svn copy https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_0 https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0</code></li>
- <li>Make a fresh checkout with the just created tag:
- <code>svn co https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0</code></li>
- <li>Copy jimi and jai to lib/ (jimi-1.0.jar, jai_core.jar, jai_codec.jar)</li>
- <li>Copy jce-jdk13-119.jar from <link href="http://www.bouncycastle.org/latest_releases.html">
- from http://www.bouncycastle.org/latest_releases.html</link> to lib/</li>
- <li>Copy the hyphenation patterns jar file
- <code>fop-hyph.jar</code> to lib/ (e.g. from
- <code>http://sourceforge.net/projects/offo</code></li>
- <li>Alternatively, create a build-local.properties file that points to the above libs.</li>
- <li>Run build[.sh] dist. Do this using Sun JDK 1.4.2_08 or later. A Forrest installation is needed.</li>
- <li>Create signatures. Don't forget to upload your KEY:
- <code>gpg -a -b --force-v3-sigs fop-1.0-src.tar.gz</code> etc.</li>
- <li>Upload the dist and signature files to your web directory
- on people.apache.org (An account on minotaur is needed):
- <code>scp fop-1.0*.tar.gz*
- chrisg@people.apache.org:public_html/</code></li>
- <li>Check permissions:
- <code>chmod 664 ... ; chgrp xmlgraphics ...</code></li>
- <li>Add MD5 sums: <code>md5 fop-1.0-src.tar.gz >
- fop-1.0-src.tar.gz.md5</code> etc.</li>
+ <li>Make a fresh checkout with the just created tag: <code>svn co https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0</code></li>
+ <li>Copy the hyphenation patterns jar file <code>fop-hyph.jar</code> to <code>lib</code> (e.g. from <code>http://sourceforge.net/projects/offo</code></li>
+ <li>Alternatively, create a <code>build-local.properties</code> file that points to the above libraries.</li>
+ <li>Run <code>build[.sh] dist</code>. Do this using Sun JDK 1.5 or later. A Forrest installation is needed.</li>
+ <li>Create signatures. Don't forget to upload your KEY: <code>gpg -a -b --force-v3-sigs fop-1.0-src.tar.gz</code> etc.</li>
+ <li>Upload the dist and signature files to your web directory on people.apache.org (An account on minotaur is needed):
+ <code>scp fop-1.0*.tar.gz* chrisg@people.apache.org:public_html/</code></li>
+ <li>Check permissions: <code>chmod 664 ... ; chgrp xmlgraphics ...</code></li>
+ <li>Add MD5 sums: <code>md5 fop-1.0-src.tar.gz > fop-1.0-src.tar.gz.md5</code> etc.</li>
<li>Make a test download.</li>
- <li>Start a vote for the release on
- <code>general@xmlgraphics.a.o</code>. The message should point
- to the release files and list the MD5 sums (<code>cat
- *.md5</code>). The vote is open for 72hrs.</li>
- <li>When the release is accepted, copy the release files,
- their md5 sum files and the signature files to
- /www/www.apache.org/dist/xmlgraphics/fop/ in the
- subdirectories <code>source</code> and
- <code>binaries</code>. Create links to all files in the
- <code>fop</code> directory. Remove the links to the files of
- the previous version.</li>
- <li>Update HEADER.html and README.html in people.apache.org:/www/www.apache.org/dist/xmlgraphics/fop/</li>
+ <li>Start a vote for the release on <code>general@xmlgraphics.apache.org</code>. The message should point
+ to the release files and list the MD5 sums (<code>cat *.md5</code>). The vote should remain open for 72hrs.</li>
+ <li>When the release is accepted, copy the release files, their md5 sum files and the signature files to
+ <code>/www/www.apache.org/dist/xmlgraphics/fop/</code> in the subdirectories <code>source</code> and
+ <code>binaries</code>. Create links to all files in the <code>fop</code> directory. Remove the links to the files of
+ the previous version.</li>
+ <li>Update <code>HEADER.html</code> and <code>README.html</code> in <code>people.apache.org:/www/www.apache.org/dist/xmlgraphics/fop/</code>.</li>
<li>Wait 24 hours (for the mirrors to catch up).</li>
- <li>Merge the changes of the subversion release branch back
- into trunk (not the version number in the build file) and
- delete the branch.</li>
+ <li>Merge the changes of the subversion release branch back into trunk (not the version number in the build file) and
+ delete the branch.</li>
<li>Deploy the updated documentation to the FOP website.</li>
- <li>Post announcements on fop-dev and fop-user and other related mailing lists.</li>
- <li>Ask a Bugzilla admin (Christian Geisert) to add a bugzilla
- entry for the new release id, or create an issue at
- <code>https://issues.apache.org/jira/browse/INFRA</code>.</li>
+ <li>Post announcements on <code>fop-dev</code> and <code>fop-user</code> and other related mailing lists.</li>
+ <li>Ask an FOP bugzilla admin to add a bugzilla entry for the new release id, or create an issue at <code>https://issues.apache.org/jira/browse/INFRA</code>.</li>
+ <li>Deploy the maven bundle.</li>
</ul>
</section>
<section id="other-checklists">
@@ -129,6 +101,7 @@ The purpose of documenting it here is to
<li><jump href="http://svn.apache.org/repos/asf/ant/core/trunk/ReleaseInstructions">Apache Ant</jump></li>
<li><jump href="http://jakarta.apache.org/cactus/participating/release_checklist.html">Apache Cactus</jump></li>
</ul>
+ <p/>
<p>Following are links with information about mirroring:</p>
<ul>
<li><jump href="http://www.apache.org/dev/mirrors.html">Apache Mirroring</jump></li>
@@ -137,7 +110,7 @@ The purpose of documenting it here is to
</section>
<section id="announcements">
<title>Announcing the release</title>
- <p>Here's a collected list of places where to announce new FOP releases:</p>
+ <p>Here's a suggested list of places where to announce new FOP releases:</p>
<ul>
<li>fop-dev@xmlgraphics.apache.org</li>
<li>fop-users@xmlgraphics.apache.org</li>
@@ -145,15 +118,14 @@ The purpose of documenting it here is to
<li>general@xml.apache.org</li>
<li>announce@apache.org (from your apache.org address)</li>
<li>xsl-list@lists.mulberrytech.com (subscriber-only)</li>
- <li>XSL-FO@yahoogroups.com (subscriber-only)</li>
+ <li>xsl-fo@yahoogroups.com (subscriber-only)</li>
<li>www-xsl-fo@w3.org</li>
<li>docbook-apps@lists.oasis-open.org (subscriber-only)</li>
<li>dita-users@yahoogroups.com (subscriber-only) (http://dita-ot.sourceforge.net/)</li>
<li>http://xslfo-zone.com/news/index.jsp</li>
<li>http://www.w3.org/Style/XSL/</li>
<li>http://freshmeat.net/projects/fop/</li>
- <li>any others?</li>
</ul>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/site.xml?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/site.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/site.xml Fri Apr 13 16:49:35 2012
@@ -151,19 +151,26 @@
<ant label="Ant Task" href="anttask.html"/>
</using>
+ <!--
+ NOTA BENE NOTA BENE NOTA BENE
+ The following features should be maintained in alphabetic order by
+ (displayed) label value.
+ NOTA BENE NOTA BENE NOTA BENE
+ -->
<features label="Features">
- <output label="Output Targets" href="output.html"/>
- <if label="Intermediate Format" href="intermediate.html"/>
- <pdfencryption label="PDF Encryption" href="pdfencryption.html"/>
- <pdfa label="PDF/A" href="pdfa.html"/>
- <pdfx label="PDF/X" href="pdfx.html"/>
- <graphics label="Graphics" href="graphics.html"/>
+ <accessibility label="Accessibility" href="accessibility.html"/>
+ <complexscripts label="Complex Scripts" href="complexscripts.html"/>
+ <events label="Events" href="events.html"/>
+ <extensions label="Extensions" href="extensions.html"/>
<fonts label="Fonts" href="fonts.html"/>
+ <graphics label="Graphics" href="graphics.html"/>
<hyphenation label="Hyphenation" href="hyphenation.html"/>
- <extensions label="Extensions" href="extensions.html"/>
- <events label="Events" href="events.html"/>
+ <if label="Intermediate Format" href="intermediate.html"/>
<metadata label="Metadata" href="metadata.html"/>
- <accessibility label="Accessibility" href="accessibility.html"/>
+ <output label="Output Targets" href="output.html"/>
+ <pdfa label="PDF/A" href="pdfa.html"/>
+ <pdfx label="PDF/X" href="pdfx.html"/>
+ <pdfencryption label="PDF Encryption" href="pdfencryption.html"/>
</features>
</trunk>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/output.xml Fri Apr 13 16:49:35 2012
@@ -797,6 +797,17 @@ Note that the value of the encoding attr
<source><![CDATA[
<images mode="b+w" bits-per-pixel="1" dithering-quality="maximum"/>]]></source>
<p>
+ When the boolean attribute pseg (default false) is set to true, non-inline FS11 and FS45 IOCA images are wrapped in page segment.
+ This option is provided to support printers/print servers that require this MO:DCA structure.
+ </p>
+ <source><![CDATA[
+ <images mode="b+w" bits-per-pixel="8" pseg="true"/>]]></source>
+ <p>
+ Setting the boolean attribute fs45 to true (default false) will force all images to FS45.
+ </p>
+ <source><![CDATA[
+ <images mode="b+w" bits-per-pixel="8" fs45="true"/>]]></source>
+ <p>
By default, JPEG images are rasterized to a bitmap and the bitmap is included in the AFP doc.
However it is possible to encode in a lossless way to maintain maximum quality. But due
to lack of support for compression schemes like LZW (patent concerns), bitmap data is currently
@@ -1308,6 +1319,7 @@ Note that the value of the encoding attr
a quick-and-dirty view of the document text. The renderer is very limited,
so do not be surprised if it gives unsatisfactory results.
</p>
+ <!-- OBSOLETE OBSOLETE OBSOLETE
<p>
The Text renderer works with a fixed size page buffer. The size of this
buffer is controlled with the textCPI and textLPI public variables.
@@ -1318,6 +1330,7 @@ Note that the value of the encoding attr
Graphic elements (lines, borders, etc) are assigned a lower priority
than text, so text will overwrite any graphic element representations.
</p>
+ -->
<p>
Because FOP lays the text onto a grid during layout, there are frequently
extra or missing spaces between characters and lines, which is generally
@@ -1326,8 +1339,8 @@ Note that the value of the encoding attr
</p>
<ul>
<li>font-family="Courier"</li>
- <li>font-size="7.3pt"</li>
- <li>line-height="10.5pt"</li>
+ <li>font-size="10pt"</li>
+ <li>line-height="10pt"</li>
</ul>
</section>
<section id="sandbox">
@@ -1377,4 +1390,4 @@ Note that the value of the encoding attr
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/running.xml?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/running.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/content/xdocs/trunk/running.xml Fri Apr 13 16:49:35 2012
@@ -117,6 +117,7 @@ Fop [options] [-fo|-xml] infile [-xsl fi
-q quiet mode
-c cfg.xml use additional configuration file cfg.xml
-l lang the language to use for user information
+ -nocs disable complex script features
-r relaxed/less strict validation (where available)
-dpi xxx target resolution in dots per inch (dpi) where xxx is a number
-s for area tree XML, down to block areas only
@@ -366,4 +367,4 @@ Fop [options] [-fo|-xml] infile [-xsl fi
<p>If you have problems running FOP, please see the <a href="../gethelp.html">"How to get Help" page</a>.</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/skinconf.xml?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/skinconf.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/documentation/skinconf.xml Fri Apr 13 16:49:35 2012
@@ -148,6 +148,10 @@ See main/fresh-site/src/documentation/sk
<!-- The normal content should be at natural size -->
#content { font-size: 100%; }
+ .tw30 { width: 30% !important; }
+ .tw70 { width: 70% !important; }
+ .tw80 { width: 80% !important; }
+
p.quote {
margin-left: 2em;
padding: .5em;
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPPaintingState.java Fri Apr 13 16:49:35 2012
@@ -84,6 +84,13 @@ public class AFPPaintingState extends or
/** determines whether to stroke text in GOCA mode or to use text operators where possible */
private boolean strokeGocaText = false;
+
+ /** use page segment with F11 and F45 images*/
+ private boolean pSeg;
+
+ /** use FS45 images*/
+ private boolean fs45;
+
/** the current page */
private transient AFPPagePaintingState pagePaintingState = new AFPPagePaintingState();
@@ -356,6 +363,41 @@ public class AFPPaintingState extends or
return this.strokeGocaText;
}
+ /**
+ * Whether FS11 and SF45 non-inline images should be wrapped in a page segment
+ * @return true iff images should be wrapped
+ */
+ public boolean getWrapPSeg() {
+ return pSeg;
+ }
+
+ /**
+ * Sets whether FS11 and FS45 non-inline images should be wrapped in a page segment
+ * @param pSeg true iff images should be wrapped
+ */
+ public void setWrapPSeg(boolean pSeg) {
+ this.pSeg = pSeg;
+ }
+
+
+ /**
+ * gets whether images should be FS45
+ * @return true iff images should be FS45
+ */
+ public boolean getFS45() {
+ return fs45;
+ }
+
+ /**
+ * sets whether images should be FS45
+ * @param fs45 true iff images should be FS45
+ */
+ public void setFS45(boolean fs45) {
+ this.fs45 = fs45;
+ }
+
+
+
/** {@inheritDoc} */
@Override
protected AbstractData instantiateData() {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPResourceLevel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPResourceLevel.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPResourceLevel.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/AFPResourceLevel.java Fri Apr 13 16:49:35 2012
@@ -186,7 +186,7 @@ public class AFPResourceLevel {
}
AFPResourceLevel rl = (AFPResourceLevel)obj;
- return (level == level)
+ return (level == rl.level)
&& (extFilePath == rl.extFilePath
|| extFilePath != null && extFilePath.equals(rl.extFilePath));
}
Propchange: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/apps/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/apps:r1307576-1325837
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/AFPFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/AFPFont.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/AFPFont.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/AFPFont.java Fri Apr 13 16:49:35 2012
@@ -19,6 +19,7 @@
package org.apache.fop.afp.fonts;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -62,8 +63,8 @@ public abstract class AFPFont extends Ty
}
/** {@inheritDoc} */
- public Set getFamilyNames() {
- Set s = new java.util.HashSet();
+ public Set<String> getFamilyNames() {
+ Set<String> s = new HashSet<String>();
s.add(this.name);
return s;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java Fri Apr 13 16:49:35 2012
@@ -285,12 +285,12 @@ public abstract class CharacterSetBuilde
CharacterSetOrientation[] characterSetOrientations
= processFontOrientation(structuredFieldReader);
- int metricNormalizationFactor;
+ double metricNormalizationFactor;
if (fontControl.isRelative()) {
metricNormalizationFactor = 1;
} else {
int dpi = fontControl.getDpi();
- metricNormalizationFactor = 1000 * 72000
+ metricNormalizationFactor = 1000.0d * 72000.0d
/ fontDescriptor.getNominalFontSizeInMillipoints() / dpi;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/fonts/RasterFont.java Fri Apr 13 16:49:35 2012
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.SortedMap;
+import java.util.TreeMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,9 +40,8 @@ public class RasterFont extends AFPFont
/** Static logging instance */
protected static final Log LOG = LogFactory.getLog("org.apache.fop.afp.fonts");
- private final SortedMap/*<Integer,CharacterSet>*/ charSets
- = new java.util.TreeMap/*<Integer,CharacterSet>*/();
- private Map/*<Integer,CharacterSet>*/ substitutionCharSets;
+ private final SortedMap<Integer, CharacterSet> charSets = new TreeMap<Integer, CharacterSet>();
+ private Map<Integer, CharacterSet> substitutionCharSets;
private CharacterSet charSet = null;
@@ -92,8 +92,8 @@ public class RasterFont extends AFPFont
// No match or substitution found, but there exist entries
// for other sizes
// Get char set with nearest, smallest font size
- SortedMap smallerSizes = charSets.headMap(requestedSize);
- SortedMap largerSizes = charSets.tailMap(requestedSize);
+ SortedMap<Integer, CharacterSet> smallerSizes = charSets.headMap(requestedSize);
+ SortedMap<Integer, CharacterSet> largerSizes = charSets.tailMap(requestedSize);
int smallerSize = smallerSizes.isEmpty() ? 0
: ((Integer)smallerSizes.lastKey()).intValue();
int largerSize = largerSizes.isEmpty() ? Integer.MAX_VALUE
@@ -112,7 +112,7 @@ public class RasterFont extends AFPFont
// Add the substitute mapping, so subsequent calls will
// find it immediately
if (substitutionCharSets == null) {
- substitutionCharSets = new HashMap();
+ substitutionCharSets = new HashMap<Integer, CharacterSet>();
}
substitutionCharSets.put(requestedSize, csm);
// do not output the warning if the font size is closer to an integer less than 0.1
@@ -140,9 +140,9 @@ public class RasterFont extends AFPFont
* @return the first character in this font.
*/
public int getFirstChar() {
- Iterator it = charSets.values().iterator();
+ Iterator<CharacterSet> it = charSets.values().iterator();
if (it.hasNext()) {
- CharacterSet csm = (CharacterSet) it.next();
+ CharacterSet csm = it.next();
return csm.getFirstChar();
} else {
String msg = "getFirstChar() - No character set found for font:" + getFontName();
@@ -157,9 +157,9 @@ public class RasterFont extends AFPFont
*/
public int getLastChar() {
- Iterator it = charSets.values().iterator();
+ Iterator<CharacterSet> it = charSets.values().iterator();
if (it.hasNext()) {
- CharacterSet csm = (CharacterSet) it.next();
+ CharacterSet csm = it.next();
return csm.getLastChar();
} else {
String msg = "getLastChar() - No character set found for font:" + getFontName();
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageObject.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/modca/ImageObject.java Fri Apr 13 16:49:35 2012
@@ -75,10 +75,11 @@ public class ImageObject extends Abstrac
int dataHeightRes = imageObjectInfo.getDataWidthRes();
ImageDataDescriptor imageDataDescriptor
= factory.createImageDataDescriptor(dataWidth, dataHeight, dataWidthRes, dataHeightRes);
- if (imageObjectInfo.getBitsPerPixel() == 1) {
- imageDataDescriptor.setFunctionSet(ImageDataDescriptor.FUNCTION_SET_FS10);
- } else if (MimeConstants.MIME_AFP_IOCA_FS45.equals(imageObjectInfo.getMimeType())) {
+
+ if (MimeConstants.MIME_AFP_IOCA_FS45.equals(imageObjectInfo.getMimeType())) {
imageDataDescriptor.setFunctionSet(ImageDataDescriptor.FUNCTION_SET_FS45);
+ } else if (imageObjectInfo.getBitsPerPixel() == 1) {
+ imageDataDescriptor.setFunctionSet(ImageDataDescriptor.FUNCTION_SET_FS10);
}
getObjectEnvironmentGroup().setDataDescriptor(imageDataDescriptor);
getObjectEnvironmentGroup().setMapImageObject(
Propchange: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/afp/parser/
------------------------------------------------------------------------------
Merged /xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/parser:r1307576-1325837
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Area.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Area.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Area.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Area.java Fri Apr 13 16:49:35 2012
@@ -21,6 +21,7 @@ package org.apache.fop.area;
import java.io.Serializable;
import java.util.Map;
+import java.util.TreeMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -116,9 +117,9 @@ public class Area extends AreaTreeObject
protected int bidiLevel = -1;
/**
- * Traits for this area stored in a HashMap
+ * Traits for this area.
*/
- protected transient Map<Integer, Object> traits = null;
+ protected TreeMap<Integer, Object> traits;
/**
* logging instance
@@ -134,6 +135,15 @@ public class Area extends AreaTreeObject
return this.areaClass;
}
+ /** {@inheritDoc} */
+ public Object clone() throws CloneNotSupportedException {
+ Area area = (Area) super.clone();
+ if (traits != null) {
+ area.traits = (TreeMap<Integer, Object>) traits.clone();
+ }
+ return area;
+ }
+
/**
* Set the area class of this area.
*
@@ -390,8 +400,9 @@ public class Area extends AreaTreeObject
* @param prop the value of the trait
*/
public void addTrait(Integer traitCode, Object prop) {
+ // use treemap since the typical number of traits are less than four
if (traits == null) {
- traits = new java.util.HashMap<Integer, Object>(20);
+ traits = new TreeMap<Integer, Object>();
}
traits.put(traitCode, prop);
}
@@ -403,7 +414,7 @@ public class Area extends AreaTreeObject
*/
public void setTraits ( Map traits ) {
if ( traits != null ) {
- this.traits = new java.util.HashMap ( traits );
+ this.traits = new TreeMap<Integer, Object>( traits );
} else {
this.traits = null;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeObject.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeObject.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/AreaTreeObject.java Fri Apr 13 16:49:35 2012
@@ -19,7 +19,9 @@
package org.apache.fop.area;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,7 +32,7 @@ import org.apache.fop.fo.extensions.Exte
/**
* Abstract base class for all area tree objects.
*/
-public abstract class AreaTreeObject {
+public abstract class AreaTreeObject implements Cloneable {
/** Foreign attributes */
protected Map<QName, String> foreignAttributes = null;
@@ -38,6 +40,18 @@ public abstract class AreaTreeObject {
/** Extension attachments */
protected List<ExtensionAttachment> extensionAttachments = null;
+ /** {@inheritDoc} */
+ public Object clone() throws CloneNotSupportedException {
+ AreaTreeObject ato = (AreaTreeObject) super.clone();
+ if (foreignAttributes != null) {
+ ato.foreignAttributes = (Map) ((HashMap) foreignAttributes).clone();
+ }
+ if (extensionAttachments != null) {
+ ato.extensionAttachments = (List) ((ArrayList) extensionAttachments).clone();
+ }
+ return ato;
+ }
+
/**
* Sets a foreign attribute.
* @param name the qualified name of the attribute
@@ -45,7 +59,7 @@ public abstract class AreaTreeObject {
*/
public void setForeignAttribute(QName name, String value) {
if (this.foreignAttributes == null) {
- this.foreignAttributes = new java.util.HashMap<QName, String>();
+ this.foreignAttributes = new HashMap<QName, String>();
}
this.foreignAttributes.put(name, value);
}
@@ -88,7 +102,7 @@ public abstract class AreaTreeObject {
private void prepareExtensionAttachmentContainer() {
if (this.extensionAttachments == null) {
- this.extensionAttachments = new java.util.ArrayList<ExtensionAttachment>();
+ this.extensionAttachments = new ArrayList<ExtensionAttachment>();
}
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/BodyRegion.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/BodyRegion.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/BodyRegion.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/BodyRegion.java Fri Apr 13 16:49:35 2012
@@ -151,19 +151,11 @@ public class BodyRegion extends RegionRe
}
}
- /**
- * Clone this object.
- *
- * @return a shallow copy of this object
- */
- public Object clone() {
- BodyRegion br = new BodyRegion(getRegionClass(), getRegionName(), regionViewport,
- getColumnCount(), getColumnGap());
- br.setCTM(getCTM());
- br.setIPD(getIPD());
- br.beforeFloat = beforeFloat;
- br.mainReference = mainReference;
- br.footnote = footnote;
+ /** {@inheritDoc} */
+ public Object clone() throws CloneNotSupportedException {
+ BodyRegion br = (BodyRegion) super.clone();
+ br.mainReference = new MainReference(br);
return br;
}
+
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Page.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Page.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Page.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/Page.java Fri Apr 13 16:49:35 2012
@@ -54,7 +54,7 @@ import static org.apache.fop.fo.Constant
* The page is cloneable so the page master can make copies of
* the top level page and regions.
*/
-public class Page extends AreaTreeObject implements Serializable, Cloneable {
+public class Page extends AreaTreeObject implements Serializable {
private static final long serialVersionUID = 6272157047421543866L;
@@ -72,10 +72,9 @@ public class Page extends AreaTreeObject
private boolean fakeNonEmpty = false;
/**
- * Empty constructor, for cloning
+ * Empty constructor
*/
- public Page() {
- }
+ public Page() { }
/**
* Constructor
@@ -258,14 +257,9 @@ public class Page extends AreaTreeObject
}
}
- /**
- * Clone this page.
- * This returns a new page with a clone of all the regions.
- *
- * @return a new clone of this page
- */
- public Object clone() {
- Page p = new Page();
+ /** {@inheritDoc} */
+ public Object clone() throws CloneNotSupportedException {
+ Page p = (Page) super.clone();
if (regionBefore != null) {
p.regionBefore = (RegionViewport)regionBefore.clone();
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/PageViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/PageViewport.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/PageViewport.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/PageViewport.java Fri Apr 13 16:49:35 2012
@@ -32,6 +32,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.traits.WritingModeTraitsGetter;
@@ -50,7 +51,7 @@ import static org.apache.fop.fo.Constant
* This is the level that creates the page.
* The page (reference area) is then rendered inside the page object
*/
-public class PageViewport extends AreaTreeObject implements Resolvable, Cloneable {
+public class PageViewport extends AreaTreeObject implements Resolvable {
private Page page;
private Rectangle viewArea;
@@ -130,8 +131,9 @@ public class PageViewport extends AreaTr
/**
* Copy constructor.
* @param original the original PageViewport to copy from
+ * @throws FOPException when cloning of the page is not supported
*/
- public PageViewport(PageViewport original) {
+ public PageViewport(PageViewport original) throws FOPException {
if (original.extensionAttachments != null) {
setExtensionAttachments(original.extensionAttachments);
}
@@ -141,7 +143,11 @@ public class PageViewport extends AreaTr
this.pageIndex = original.pageIndex;
this.pageNumber = original.pageNumber;
this.pageNumberString = original.pageNumberString;
- this.page = (Page)original.page.clone();
+ try {
+ this.page = (Page) original.page.clone();
+ } catch (CloneNotSupportedException e) {
+ throw new FOPException(e);
+ }
this.viewArea = new Rectangle(original.viewArea);
this.simplePageMasterName = original.simplePageMasterName;
this.blank = original.blank;
@@ -557,13 +563,12 @@ public class PageViewport extends AreaTr
}
}
- /**
- * Clone this page.
- * Used by the page master to create a copy of an original page.
- * @return a copy of this page and associated viewports
- */
- public Object clone() {
- return new PageViewport(this);
+ /** {@inheritDoc} */
+ public Object clone() throws CloneNotSupportedException {
+ PageViewport pvp = (PageViewport) super.clone();
+ pvp.page = (Page) page.clone();
+ pvp.viewArea = (Rectangle) viewArea.clone();
+ return pvp;
}
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionReference.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionReference.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionReference.java Fri Apr 13 16:49:35 2012
@@ -29,7 +29,7 @@ import org.apache.fop.fo.pagination.Regi
* This area is the direct child of a region-viewport-area. It is cloneable
* so the page master can make copies from the original page and regions.
*/
-public class RegionReference extends Area implements Cloneable {
+public class RegionReference extends Area {
private static final long serialVersionUID = -298980963268244238L;
@@ -134,17 +134,10 @@ public class RegionReference extends Are
addChildArea(block);
}
- /**
- * Clone this region.
- * This is used when cloning the page by the page master.
- *
- * @return a copy of this region reference area
- */
- public Object clone() {
- RegionReference rr = new RegionReference(regionClass, regionName, regionViewport);
- rr.ctm = ctm;
- rr.setIPD(getIPD());
- rr.blocks = (ArrayList<Area>)blocks.clone();
+ /** {@inheritDoc} */
+ public Object clone() throws CloneNotSupportedException {
+ RegionReference rr = (RegionReference) super.clone();
+ rr.blocks = (ArrayList) blocks.clone();
return rr;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionViewport.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionViewport.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/RegionViewport.java Fri Apr 13 16:49:35 2012
@@ -22,7 +22,7 @@ package org.apache.fop.area;
import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
-import java.util.HashMap;
+import java.util.TreeMap;
import org.apache.fop.traits.WritingModeTraitsGetter;
@@ -32,7 +32,7 @@ import org.apache.fop.traits.WritingMode
* 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, Viewport {
+public class RegionViewport extends Area implements Viewport {
private static final long serialVersionUID = 505781815165102572L;
@@ -108,7 +108,7 @@ public class RegionViewport extends Area
out.writeFloat((float) viewArea.getWidth());
out.writeFloat((float) viewArea.getHeight());
out.writeBoolean(clip);
- out.writeObject(traits);
+ out.writeObject((TreeMap)traits);
out.writeObject(regionReference);
}
@@ -117,25 +117,15 @@ public class RegionViewport extends Area
viewArea = new Rectangle2D.Float(in.readFloat(), in.readFloat(),
in.readFloat(), in.readFloat());
clip = in.readBoolean();
- traits = (HashMap)in.readObject();
+ traits = (TreeMap)in.readObject();
setRegionReference((RegionReference) in.readObject());
}
- /**
- * Clone this region viewport.
- * Used when creating a copy from the page master.
- *
- * @return a new copy of this region viewport
- */
- public Object clone() {
- RegionViewport rv = new RegionViewport((Rectangle2D)viewArea.clone());
- rv.regionReference = (RegionReference)regionReference.clone();
- if (traits != null) {
- rv.traits = new HashMap(traits);
- }
- if (foreignAttributes != null) {
- rv.foreignAttributes = new HashMap(foreignAttributes);
- }
+ /** {@inheritDoc} */
+ public Object clone() throws CloneNotSupportedException {
+ RegionViewport rv = (RegionViewport) super.clone();
+ rv.regionReference = (RegionReference) regionReference.clone();
+ rv.viewArea = (Rectangle2D) viewArea.clone();
return rv;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineViewport.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineViewport.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/area/inline/InlineViewport.java Fri Apr 13 16:49:35 2012
@@ -22,7 +22,7 @@ package org.apache.fop.area.inline;
import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
-import java.util.HashMap;
+import java.util.TreeMap;
import org.apache.fop.area.Area;
import org.apache.fop.area.Viewport;
@@ -132,7 +132,7 @@ public class InlineViewport extends Inli
out.writeFloat((float) contentPosition.getHeight());
}
out.writeBoolean(clip);
- out.writeObject(traits);
+ out.writeObject((TreeMap)traits);
out.writeObject(content);
}
@@ -145,7 +145,7 @@ public class InlineViewport extends Inli
in.readFloat());
}
this.clip = in.readBoolean();
- this.traits = (HashMap) in.readObject();
+ this.traits = (TreeMap) in.readObject();
this.content = (Area) in.readObject();
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/Event.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/Event.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/Event.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/Event.java Fri Apr 13 16:49:35 2012
@@ -21,27 +21,28 @@ package org.apache.fop.events;
import java.util.Collections;
import java.util.EventObject;
+import java.util.Locale;
import java.util.Map;
import org.apache.fop.events.model.EventSeverity;
/**
* This is the default event class used by this package. Each event has a unique event identifier
- * (a String), a severity indicator and a map of name/value pairs.
+ * (a String), a severity indicator, a locale (for formatting event messages), and a map of
+ * name/value pairs.
*/
public class Event extends EventObject {
private static final long serialVersionUID = -1310594422868258083L;
private String eventGroupID;
-
private String eventKey;
-
private EventSeverity severity;
+ private Locale locale;
private Map<String, Object> params;
/**
- * Creates a new Event.
+ * Creates a new Event using default locale.
* @param source the object that creates the event
* @param eventID the unique identifier of the event
* @param severity the severity level
@@ -49,6 +50,19 @@ public class Event extends EventObject {
*/
public Event(Object source, String eventID, EventSeverity severity, Map<String, Object> params)
{
+ this ( source, eventID, severity, Locale.getDefault(), params );
+ }
+
+ /**
+ * Creates a new Event.
+ * @param source the object that creates the event
+ * @param eventID the unique identifier of the event
+ * @param severity the severity level
+ * @param locale to use when formatting event (or null, which means use default locale)
+ * @param params the event parameters (a map of name/value pairs)
+ */
+ public Event(Object source, String eventID, EventSeverity severity, Locale locale, Map<String, Object> params)
+ {
super(source);
int pos = eventID.lastIndexOf('.');
if (pos < 0 || pos == eventID.length() - 1) {
@@ -58,6 +72,7 @@ public class Event extends EventObject {
eventKey = eventID.substring(pos + 1);
}
setSeverity(severity);
+ this.locale = locale;
this.params = params;
}
@@ -107,6 +122,14 @@ public class Event extends EventObject {
}
/**
+ * Returns the locale.
+ * @return the locale
+ */
+ public Locale getLocale() {
+ return this.locale;
+ }
+
+ /**
* Returns a parameter.
* @param key the key to the parameter
* @return the parameter value or null if no value with this key is found
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/EventFormatter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/EventFormatter.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/EventFormatter.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/events/EventFormatter.java Fri Apr 13 16:49:35 2012
@@ -47,25 +47,28 @@ public final class EventFormatter {
//utility class
}
+ private static ResourceBundle getBundle ( String groupID, Locale locale ) {
+ ResourceBundle bundle;
+ String baseName = ( groupID != null ) ? groupID : EventFormatter.class.getName();
+ try {
+ ClassLoader classLoader = EventFormatter.class.getClassLoader();
+ bundle = XMLResourceBundle.getXMLBundle ( baseName, locale, classLoader );
+ } catch ( MissingResourceException e ) {
+ if ( log.isTraceEnabled() ) {
+ log.trace ( "No XMLResourceBundle for " + baseName + " available." );
+ }
+ bundle = null;
+ }
+ return bundle;
+ }
+
/**
* Formats an event using the default locale.
* @param event the event
* @return the formatted message
*/
- public static String format(Event event) {
- ResourceBundle bundle = null;
- String groupID = event.getEventGroupID();
- if (groupID != null) {
- try {
- bundle = XMLResourceBundle.getXMLBundle(
- groupID,
- EventFormatter.class.getClassLoader());
- } catch (MissingResourceException mre) {
- throw new IllegalStateException("No XMLResourceBundle for " + groupID
- + " available.");
- }
- }
- return format(event, bundle);
+ public static String format ( Event event ) {
+ return format ( event, event.getLocale() );
}
/**
@@ -75,31 +78,19 @@ public final class EventFormatter {
* @return the formatted message
*/
public static String format(Event event, Locale locale) {
- ResourceBundle bundle = null;
- String groupID = event.getEventGroupID();
- if (groupID != null) {
- try {
- bundle = XMLResourceBundle.getXMLBundle(
- groupID, locale,
- EventFormatter.class.getClassLoader());
- } catch (MissingResourceException mre) {
- if (log.isTraceEnabled()) {
- log.trace("No XMLResourceBundle for " + groupID + " available.");
- }
- }
- }
- if (bundle == null) {
- bundle = XMLResourceBundle.getXMLBundle(
- EventFormatter.class.getName(),
- locale,
- EventFormatter.class.getClassLoader());
- }
- return format(event, bundle);
+ return format ( event, getBundle ( event.getEventGroupID(), locale ) );
}
- private static String format(Event event, ResourceBundle bundle) {
- String template = bundle.getString(event.getEventKey());
- return format(event, processIncludes(template, bundle));
+ private static String format ( Event event, ResourceBundle bundle ) {
+ assert event != null;
+ String key = event.getEventKey();
+ String template;
+ if ( bundle != null ) {
+ template = bundle.getString ( key );
+ } else {
+ template = "Missing bundle. Can't lookup event key: '" + key + "'.";
+ }
+ return format ( event, processIncludes ( template, bundle ) );
}
private static String processIncludes(String template, ResourceBundle bundle) {
@@ -118,14 +109,16 @@ public final class EventFormatter {
private static int processIncludesInner(CharSequence template, StringBuffer sb,
ResourceBundle bundle) {
int replacements = 0;
- Matcher m = INCLUDES_PATTERN.matcher(template);
- while (m.find()) {
- String include = m.group();
- include = include.substring(2, include.length() - 2);
- m.appendReplacement(sb, bundle.getString(include));
- replacements++;
+ if ( bundle != null ) {
+ Matcher m = INCLUDES_PATTERN.matcher(template);
+ while (m.find()) {
+ String include = m.group();
+ include = include.substring(2, include.length() - 2);
+ m.appendReplacement(sb, bundle.getString(include));
+ replacements++;
+ }
+ m.appendTail(sb);
}
- m.appendTail(sb);
return replacements;
}
@@ -141,6 +134,8 @@ public final class EventFormatter {
Map params = new java.util.HashMap(event.getParams());
params.put("source", event.getSource());
params.put("severity", event.getSeverity());
+ params.put("groupID", event.getEventGroupID());
+ params.put("locale", event.getLocale());
return format.format(params);
}
@@ -157,8 +152,12 @@ public final class EventFormatter {
}
public void write(StringBuffer sb, Map params) {
- // TODO there's no defaultBundle anymore
-// sb.append(defaultBundle.getString(getKey(params)));
+ String groupID = (String) params.get("groupID");
+ Locale locale = (Locale) params.get("locale");
+ ResourceBundle bundle = getBundle ( groupID, locale );
+ if ( bundle != null ) {
+ sb.append(bundle.getString(getKey(params)));
+ }
}
private String getKey(Map params) {
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FONode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FONode.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FONode.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FONode.java Fri Apr 13 16:49:35 2012
@@ -405,6 +405,27 @@ public abstract class FONode implements
}
/**
+ * Helper function to obtain standard usage prefix for FOP related
+ * namespace URIs.
+ * @param namespaceURI URI of node found
+ * (e.g., "http://www.w3.org/1999/XSL/Format")
+ * @return the prefix or null if none
+ */
+ public static String getNodePrefix(String namespaceURI) {
+ if (namespaceURI.equals(FOElementMapping.URI)) {
+ return "fo";
+ } else if (namespaceURI.equals(ExtensionElementMapping.URI)) {
+ return "fox";
+ } else if (namespaceURI.equals(InternalElementMapping.URI)) {
+ return "foi";
+ } else if (namespaceURI.equals(SVGElementMapping.URI)) {
+ return "svg";
+ } else {
+ return null;
+ }
+ }
+
+ /**
* Helper function to standardize the names of all namespace URI - local
* name pairs in text messages.
* For readability, using fo:, fox:, svg:, for those namespaces even
@@ -416,14 +437,9 @@ public abstract class FONode implements
* with the unabbreviated URI otherwise.
*/
public static String getNodeString(String namespaceURI, String localName) {
- if (namespaceURI.equals(FOElementMapping.URI)) {
- return "fo:" + localName;
- } else if (namespaceURI.equals(ExtensionElementMapping.URI)) {
- return "fox:" + localName;
- } else if (namespaceURI.equals(InternalElementMapping.URI)) {
- return "foi:" + localName; // used FOP internally for accessibility
- } else if (namespaceURI.equals(SVGElementMapping.URI)) {
- return "svg:" + localName;
+ String prefix = getNodePrefix ( namespaceURI );
+ if ( prefix != null ) {
+ return prefix + ":" + localName;
} else {
return "(Namespace URI: \"" + namespaceURI + "\", "
+ "Local Name: \"" + localName + "\")";
@@ -527,16 +543,22 @@ public abstract class FONode implements
*
* @param loc org.xml.sax.Locator object of the error (*not* parent node)
* @param parentName the name of the parent element
- * @param nsURI namespace URI of incoming invalid node
- * @param lName local name (i.e., no prefix) of incoming node
+ * @param nsURI namespace URI of incoming offending node
+ * @param lName local name (i.e., no prefix) of incoming offending node
* @param ruleViolated name of the rule violated (used to lookup a resource in a bundle)
* @throws ValidationException the validation error provoked by the method call
*/
protected void invalidChildError(Locator loc, String parentName, String nsURI, String lName,
String ruleViolated)
throws ValidationException {
- getFOValidationEventProducer().invalidChild(this, parentName,
- new QName(nsURI, lName), ruleViolated, loc);
+ String prefix = getNodePrefix ( nsURI );
+ QName qn; // qualified name of offending node
+ if ( prefix != null ) {
+ qn = new QName(nsURI, prefix, lName);
+ } else {
+ qn = new QName(nsURI, lName);
+ }
+ getFOValidationEventProducer().invalidChild(this, parentName, qn, ruleViolated, loc);
}
/**
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/FObj.java Fri Apr 13 16:49:35 2012
@@ -501,7 +501,7 @@ public abstract class FObj extends FONod
* @param lName local name (i.e., no prefix) of incoming node
* @return true if a member, false if not
*/
- boolean isNeutralItem(String nsURI, String lName) {
+ protected boolean isNeutralItem(String nsURI, String lName) {
return (FO_URI.equals(nsURI)
&& ("multi-switch".equals(lName)
|| "multi-properties".equals(lName)
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java Fri Apr 13 16:49:35 2012
@@ -103,17 +103,30 @@ public abstract class AbstractRetrieveMa
pList,
newPropertyList);
addChildTo(newChild, newParent);
- if (newChild.getNameId() == FO_TABLE) {
+ switch ( newChild.getNameId() ) {
+ case FO_TABLE:
Table t = (Table) child;
cloneSubtree(t.getColumns().iterator(),
- newChild, marker, newPropertyList);
+ newChild, marker, newPropertyList);
cloneSingleNode(t.getTableHeader(),
- newChild, marker, newPropertyList);
+ newChild, marker, newPropertyList);
cloneSingleNode(t.getTableFooter(),
- newChild, marker, newPropertyList);
+ newChild, marker, newPropertyList);
+ cloneSubtree(child.getChildNodes(),
+ newChild, marker, newPropertyList);
+ break;
+ case FO_LIST_ITEM:
+ ListItem li = (ListItem) child;
+ cloneSingleNode(li.getLabel(),
+ newChild, marker, newPropertyList);
+ cloneSingleNode(li.getBody(),
+ newChild, marker, newPropertyList);
+ break;
+ default:
+ cloneSubtree(child.getChildNodes(),
+ newChild, marker, newPropertyList);
+ break;
}
- cloneSubtree(child.getChildNodes(), newChild,
- marker, newPropertyList);
} else if (child instanceof FOText) {
FOText ft = (FOText) newChild;
ft.bind(parentPropertyList);
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Inline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Inline.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Inline.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Inline.java Fri Apr 13 16:49:35 2012
@@ -116,9 +116,9 @@ public class Inline extends InlineLevel
}
} else if (!isBlockOrInlineItem(nsURI, localName)) {
invalidChildError(loc, nsURI, localName);
- } else if (!canHaveBlockLevelChildren && isBlockItem(nsURI, localName)) {
- invalidChildError(loc, getParent().getName(), nsURI, getName(),
- "rule.inlineContent");
+ } else if (!canHaveBlockLevelChildren && isBlockItem(nsURI, localName)
+ && !isNeutralItem(nsURI, localName)) {
+ invalidChildError(loc, getName(), nsURI, localName, "rule.inlineContent");
} else {
blockOrInlineItemFound = true;
}
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java?rev=1325839&r1=1325838&r2=1325839&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/src/java/org/apache/fop/fo/flow/Leader.java Fri Apr 13 16:49:35 2012
@@ -79,7 +79,8 @@ public class Leader extends InlineLevel
leaderLength = pList.get(PR_LEADER_LENGTH).getLengthRange();
leaderPattern = pList.get(PR_LEADER_PATTERN).getEnum();
leaderPatternWidth = pList.get(PR_LEADER_PATTERN_WIDTH).getLength();
- ruleThickness = pList.get(PR_RULE_THICKNESS).getLength();
+ // use default rule thickness as a default
+ ruleThickness = getPropertyMakerFor(PR_RULE_THICKNESS).make(pList).getLength();
switch(leaderPattern) {
case EN_SPACE:
// use Space
@@ -88,6 +89,8 @@ public class Leader extends InlineLevel
// the following properties only apply
// for leader-pattern = "rule"
ruleStyle = pList.get(PR_RULE_STYLE).getEnum();
+ // use specified rule thickness to override default (established above)
+ ruleThickness = pList.get(PR_RULE_THICKNESS).getLength();
break;
case EN_DOTS:
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org