Skip to content

Commit

Permalink
Tagging for the 0.94 release.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94@567305 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Vincent Hennebert committed Aug 18, 2007
2 parents 840decd + 00a5a03 commit b29991c
Show file tree
Hide file tree
Showing 17 changed files with 296 additions and 195 deletions.
37 changes: 37 additions & 0 deletions KEYS
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ pub 1024D/7C611584 2005-07-19 Jeremias M
sub 2048g/C0F1AD34 2005-07-19
pub 1024D/5F298824 2006-09-30 Simon Pepping <[email protected]>
sub 2048g/40F32100 2006-09-30
pub 1024D/4358C584 2006-12-08 Vincent Hennebert <[email protected]>
sub 2048g/0BD6AC9B 2006-12-08


-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.0.6 (GNU/Linux)
Expand Down Expand Up @@ -130,3 +133,37 @@ CQlmAYAACgkQPipvwl8piCQmlgCgmxawADNcQDnWuFpJ/jaHRdhDKLAAnjhAoZ/D
nruGzxj+A7iyYEB9I6Uk
=NbVl
-----END PGP PUBLIC KEY BLOCK-----

-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

mQGiBEV5mbgRBACBd9xGOGzs8ah/N11zlDi8woJUh02EgztXdMfij4F3u12DkneC
OIwGH14fWHdkhKjwYMi5LQfvBsnd3P5v5PTBxYati7ZQDDjvYsAJiMXbyUdszdyQ
ig/UuNMwdB5YBrdtklzZcOuiNt/yeoocURQRwkwklsVBIYWwovcdXLTRWwCglPVQ
0NrC7VPRPTgK0Y1wxOgwzj0D/RpwFEAcl1SJHoOwhwKykNzA05YABaxXhksKi2qQ
C8M4mUofqweU3ocU0tBqQAR351n7hQWAaIs6ScOQtcKPJj9SV8SQgqxwj7WfHscj
9X3lkP6cxstW+W8SblTgrKwl7JLLkja1u1cNUeD0QzWImuRBpOjh4s97ZFwSHRoH
hCLgA/4/GDXbOhC4Wi9i8HHQNhEA6l86ZBteGq5u4SW57cK69mnOGj8iBxenIWeU
+NuB/LqVcG/75JnDvVGImvoykCBEl9xASNOj1C4HvBwNrU7iIpvRig1wwHK8/wqU
Dhq5433rh40YbOfN0PLZDhQNhf3MysP3ipTZkVdwIKhsvl/vibQ2VmluY2VudCBI
ZW5uZWJlcnQgPHZpbmNlbnQuaGVubmViZXJ0QGFueXdhcmUtdGVjaC5jb20+iGAE
ExECACAFAkV5mgcCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCgctTQQ1jF
hH7uAJ9BFRNMuSpvSq//lEWLc6WOTMW70ACghjA0jtaMQUVjDU3RUOdGMRkqRZu0
KVZpbmNlbnQgSGVubmViZXJ0IDx2aGVubmViZXJ0QGFwYWNoZS5vcmc+iGMEExEC
ACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCRXmahgIZAQAKCRCgctTQQ1jF
hLRSAJ9KgHLa9V4Q2k0NFiMpPuhfnsK9bQCeJbGjFdIgrzyIvYIUZUPQGww597+5
Ag0ERXmZwhAIAJhskbWZaLuwdZ3aLqVimVu65bR2ve1U28dfsSVCKx0uYCl3YJkj
lF9P3BfMMPVdNRqDz4Agz/Vrn13j+p4ZQQhVhv6IGhE4p4T4RebMaZ/d30/6REls
DP3Luc9IrnJbA72jSeXt+vI3WysB/wuJJ/kb+3KtFa1NowwVVypHCiSmme0VCUaR
K6jlN0245IpR0IA4Q1VziRO7v1VufZAef64/2U2T/IthwPqDoThNj++9Zg5Tctrt
TL02Z++n2Nj9bQf9R+FhA3YhvHuf6OLAPE2emcM/0As+JwBHqcMrmybnrxEJg0Aq
4Q1k1Ka7beb35QJ7158rzL1PU1V2totLeW8AAwUH/1NJVnMD/p4op2kbJYMgKSqz
zZfypt60aWeImeJ2qZD7FAtsz6KQu2a5ZkcVmyCeuAo9Sj0IqxXyn8Z6bHuHXNe+
aidjS+n5kc2Y+5RQ1oMGV+BzXQMPGOgh0ertbLaairT7mCljTEd4kUGxOIcfAh/q
Ie+p7Guvw6+T4K7hgfY8bAiVgzhZLWIFTQXpjU+91q6kTt4eIWjdCGdNQ/OBezGY
f5SCy0phzTmRqcu68nKaLznwUpI7SuSFSIeVemGz602KdFsLEHHbZE0KJgd6aHYu
ynK3sugKIpz/NXpT2vBsVkK6EP5xzWYOpqMGb8uQD8CT7loY81SK+rHBm7dicgiI
SQQYEQIACQUCRXmZwgIbDAAKCRCgctTQQ1jFhBc3AKCQ1X7oIVR8g7GvSGEUw6DE
HgEaUgCgkl30lcl9gGa9hqk4cuGYn1OTyks=
=XphF
-----END PGP PUBLIC KEY BLOCK-----
1 change: 1 addition & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,7 @@ NOTE:
<mkdir dir="${build.javadocs.dir}"/>

<javadoc
executable="${javahome.jdk14}/bin/javadoc"
packagenames="${javadoc.packages}"
destdir="${build.javadocs.dir}"
author="true"
Expand Down
2 changes: 1 addition & 1 deletion fop.bat
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.7.1.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.7.0.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\serializer-2.7.0.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik-all-1.6.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.2svn.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.2.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-4.2.0.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-1.3.1.jar
set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-logging-1.0.4.jar
Expand Down
Binary file added lib/xmlgraphics-commons-1.2.jar
Binary file not shown.
Binary file removed lib/xmlgraphics-commons-1.2svn.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions lib/xmlgraphics-commons.NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache XML Graphics Commons
Copyright 2006 The Apache Software Foundation
Copyright 2006-2007 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
The Apache Software Foundation (http://www.apache.org/).
40 changes: 20 additions & 20 deletions src/documentation/content/.htaccess
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# redirect moved files
RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/0.93/anttask$1
RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/0.93/compiling$1
RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/0.93/configuration$1
RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/0.93/embedding$1
RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/0.93/extensions$1
RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/0.93/fonts$1
RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/0.93/graphics$1
RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/0.93/hyphenation$1
RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/0.93/intermediate$1
RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/0.93/output$1
RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/0.93/pdfa$1
RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/0.93/pdfencryption$1
RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/0.93/pdfx$1
RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/0.93/running$1
RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/0.93/servlets$1
RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/0.93/upgrading$1
RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/0.94/anttask$1
RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/0.94/compiling$1
RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/0.94/configuration$1
RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/0.94/embedding$1
RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/0.94/extensions$1
RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/0.94/fonts$1
RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/0.94/graphics$1
RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/0.94/hyphenation$1
RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/0.94/intermediate$1
RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/0.94/output$1
RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/0.94/pdfa$1
RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/0.94/pdfencryption$1
RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/0.94/pdfx$1
RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/0.94/running$1
RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/0.94/servlets$1
RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/0.94/upgrading$1

# redirect to versioned documentation
Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/0.93
Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.93
Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/0.94
Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.94
Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk
Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/trunk
Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.20.5
Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.20.5
Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.93
Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.93
Redirect Temp /fop/0.90alpha1 http://xmlgraphics.apache.org/fop/0.93
Redirect Temp /fop/0.91beta http://xmlgraphics.apache.org/fop/0.93
Redirect Temp /fop/0.92beta http://xmlgraphics.apache.org/fop/0.93
4 changes: 2 additions & 2 deletions src/documentation/content/xdocs/site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<!--
BEGIN Version 0.93 documentation tab
-->
<trunk label="FOP 0.93" href="0.93/" tab="stableversion">
<trunk label="FOP 0.93" href="0.93/" tab="oldstableversion">
<about label="About" href="index.html"/>
<release label="Release Notes" href="releaseNotes_0.93.html"/>
<changes label="Changes" href="changes_0.93.html"/>
Expand Down Expand Up @@ -93,7 +93,7 @@
<!--
BEGIN Version 0.94 documentation tab
-->
<trunk label="FOP 0.94" href="0.94/" tab="develversion">
<trunk label="FOP 0.94" href="0.94/" tab="stableversion">
<about label="About" href="index.html"/>
<release label="Release Notes" href="releaseNotes_0.94.html"/>
<changes label="Changes" href="changes_0.94.html"/>
Expand Down
2 changes: 1 addition & 1 deletion src/java/org/apache/fop/fo/FOPropertyMapping.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.apache.fop.fo.properties.BoxPropShorthandParser;
import org.apache.fop.fo.properties.CharacterProperty;
import org.apache.fop.fo.properties.ColorProperty;
import org.apache.fop.fo.flow.TableFObj.ColumnNumberPropertyMaker;
import org.apache.fop.fo.properties.ColumnNumberPropertyMaker;
import org.apache.fop.fo.properties.CondLengthProperty;
import org.apache.fop.fo.properties.CorrespondingPropertyMaker;
import org.apache.fop.fo.properties.DimensionPropertyMaker;
Expand Down
4 changes: 2 additions & 2 deletions src/java/org/apache/fop/fo/RecursiveCharIterator.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private void getNextCharIter() {
*/
public boolean hasNext() {
while (curCharIter != null) {
if (curCharIter.hasNext() == false) {
if (!curCharIter.hasNext()) {
getNextCharIter();
} else {
return true;
Expand All @@ -123,7 +123,7 @@ public boolean hasNext() {
}

/**
* @see org.apache.fop.fo.CharIterator#nextChar()
* {@inheritDoc}
*/
public char nextChar() throws NoSuchElementException {
if (curCharIter != null) {
Expand Down
56 changes: 10 additions & 46 deletions src/java/org/apache/fop/fo/flow/Character.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package org.apache.fop.fo.flow;

import java.awt.Color;
import java.util.NoSuchElementException;

import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
Expand All @@ -29,17 +28,12 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.CommonFont;
import org.apache.fop.fo.properties.CommonHyphenation;
import org.apache.fop.fo.properties.CommonMarginInline;
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.CommonTextDecoration;
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.properties.SpaceProperty;
import org.apache.fop.util.CharUtilities;
import org.xml.sax.Locator;

/**
Expand All @@ -63,7 +57,8 @@ public class Character extends FObj {
private Length alignmentAdjust;
private int alignmentBaseline;
private Length baselineShift;
private char character;
/** Holds the character value */
protected char character;
private Color color;
private int dominantBaseline;
// private ToBeImplementedProperty glyphOrientationHorizontal;
Expand Down Expand Up @@ -102,7 +97,7 @@ public Character(FONode parent) {
}

/**
* @see org.apache.fop.fo.FObj#bind(PropertyList)
* {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
Expand All @@ -126,24 +121,23 @@ public void bind(PropertyList pList) throws FOPException {
}

/**
* @see org.apache.fop.fo.FONode#startOfNode
* {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
getFOEventHandler().character(this);
}

/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
* XSL Content Model: empty
* {@inheritDoc}
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
invalidChildError(loc, nsURI, localName);
}

/**
* @see org.apache.fop.fo.FObj#charIterator
* {@inheritDoc}
*/
public CharIterator charIterator() {
return new FOCharIterator(this);
Expand Down Expand Up @@ -238,48 +232,18 @@ public Property getWordSpacing() {
return wordSpacing;
}

/** @see org.apache.fop.fo.FONode#getLocalName() */
/**
* {@inheritDoc}
*/
public String getLocalName() {
return "character";
}

/**
* @see org.apache.fop.fo.FObj#getNameId()
* {@inheritDoc}
*/
public int getNameId() {
return FO_CHARACTER;
}

private class FOCharIterator extends CharIterator {

private boolean bFirst = true;
private Character foChar;

FOCharIterator(Character foChar) {
this.foChar = foChar;
}

public boolean hasNext() {
return bFirst;
}

public char nextChar() {
if (bFirst) {
bFirst = false;
return foChar.character;
} else {
throw new NoSuchElementException();
}
}

public void remove() {
foChar.parent.removeChild(foChar);
}

public void replaceChar(char c) {
foChar.character = c;
}

}

}
76 changes: 76 additions & 0 deletions src/java/org/apache/fop/fo/flow/FOCharIterator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* $Id$ */

package org.apache.fop.fo.flow;

import java.util.NoSuchElementException;

import org.apache.fop.fo.CharIterator;

/**
* Used by the RecursiveCharIterator to iterate over a Character
*/
public class FOCharIterator extends CharIterator {

private boolean bFirst = true;
private Character foChar;

/**
* Main constructor
* @param foChar the FOCharacter
*/
protected FOCharIterator(Character foChar) {
this.foChar = foChar;
}

/**
* @return true if this iterator has another character available
*/
public boolean hasNext() {
return bFirst;
}

/**
* @return the next character
*/
public char nextChar() {
if (bFirst) {
bFirst = false;
return foChar.character;
} else {
throw new NoSuchElementException();
}
}

/**
* Removes the child from the parent
*/
public void remove() {
foChar.getParent().removeChild(foChar);
}

/**
* Replaces the character with another one
* @param c the replacement character
*/
public void replaceChar(char c) {
foChar.character = c;
}

}
Loading

0 comments on commit b29991c

Please sign in to comment.