Line breaking and Hyphenation
Hello all, I tracked down the bugs 10374, 2106 and 6042. The last bug was caused by a simple, easy to fix mistake in the hyphenation framework. The bug 10374 is unfortunately a duplicate of 2106, not 6042, and a bit more interesting. It is caused by the parser delivering character references as a separate character chunk, thereby creating multiple FOText children of the block (FObjMixed) for consecutive text. This interferes badly with line breaking and hyphenation. Take e#x78;tensible with room up to the l on the line. This is split into three FOText objects e #x78; tensible The text is delivered separately to the line layout algorithm. The e and X do not fill the line but also are not words and are appended to the pendingAreas vector. The tensible then overflows the line and is passed to the hyphenation, lets say it is hyphenated as tensi-ble. The tensi- is appended without flushing the pending areas, which are put first into the next line. I put a StringBuffer into FObjMixed to accumulate consecutive addCharacters() events. This fixes the problem with character references, but not efo:inlineX/fo:inlinetensible (also noted somewhere in bugzilla as problem) The second is to flush pendig areas in addWord(). This fixes the lost characters problem but *still* does not correctly hyphenate words split into inline FOs, only the chunk actually overflowing the line is considered for hyphenation. More problems I noted: - white space is handled inconsistently - line break detection relies on white space only - word detection for hyphenation relies on white space and wrongly assumes there is a white space before the word passed to doHyphenation() - the LinkSet is not considered for hyphenated word parts in addWord, and neither for page-number-citation nor fo:character - same for most of overlining, line through and vertical alignment - characters are copied to FOText, and then copied *twice* in LineArea.layout(), one purely for hyphenation. During Layout, character data is at least three times, possibly four times (parser buffer) in memory Questions: - Is it still worth to do major hacks in LineArea.java? - Should we consider using Unicode break properties for line break opportunity detection? - How should words for hyphenation be detected? - What happens to line breaks and word detection in case of * inline graphics and other definitely non-text inlines * inline foreign elements, like formulas * inline-containers containing blocks, especially blocks with text only - Are there script or language dependencies to consider for line break and word detection? - At which point should collapse-whitespace, linefeed-treatment etc. considered? Possibilities: * while creating FOText * while feeding it into the line area * during line area layout Considering white-space-collapse during FOText creation has some problems in case of successive spaces in different inline FO. There are additional issues with consecutive spaces which had been discussed here already, in particular how foo fo:inline text-decoration=underline bar/fo:inline should be handled. Will this result in two consecutive spaces, one of them underlined? Has this issue been resolved meanwhile? J.Pietschmann - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: CVS problems
On Wed, 2002-07-03 at 15:44, Peter B. West wrote: Devs, Is anyone else experiencing cvs acces problems? I think the server is down or can't be reached. Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
XSL-FO, Chapter 18 of the XML Bible, has been updated
I'm happy to announce that I've posted an updated version of Chapter 18 of the XML Bible, XSL Formatting Objects, at Cafe con Leche: http://www.cafeconleche.org/books/bible2/chapters/ch18.html This is the complete chapter, approximately 70 pages with many full examples of XSL-FO. Everything should now be up-to-date with the November 2001 Recommmendation of the XSL-FO specification and FOP 0.20.4. Mostly the changes were fairly minor, just changing the master-name attribute to the master-reference attribute on about four elements. I also updated the FOP coverage to version 0.20.4, and fixed a few minor errors where I noticed them. -- +---++---+ | Elliotte Rusty Harold | [EMAIL PROTECTED] | Writer/Programmer | +---++---+ | XML in a Nutshell, 2nd Edition (O'Reilly, 2002) | | http://www.cafeconleche.org/books/xian2/ | | http://www.amazon.com/exec/obidos/ISBN%3D0596002920/cafeaulaitA/ | +--+-+ | Read Cafe au Lait for Java News: http://www.cafeaulait.org/ | | Read Cafe con Leche for XML News: http://www.cafeconleche.org/| +--+-+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Preventing a block from splitting
Hello, I have a question. With what implemented functionality of FOP, can I prevent a block from splitting into two pages but kept intact. For instance, I want all paragraphs to be completely in one page, and not split into two pages. How can I do that? Thanks, Mete Kural __ Do You Yahoo!? Sign up for SBC Yahoo! Dial - First Month Free http://sbc.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: System.exit stuff
J.Pietschmann schrieb: Keiron Liddle wrote: That explains it. The execution is separated between the CommandLineStarter and the AWTStarter and it needs to call exit when being run with the CommandLineStarter but not the AWTStarter. I've added other exits() in the catch clauses. Could this cause trouble too? For some reason, FOP AWT I don't think so. currently doesn't run at all, and I havn't got yet time to investigate. The removal of System.exit(0) in Fop.java fixes this. Christian - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: keep-together implementation
Mete Kural wrote: Is there any estimate on when the keep-together property will be implemented? No. The FOP Project is great although as you know it's still being developed. While I wait for FOP to be developed, what other free XSL-FO formatters can I use to generate PDFs? Try passivetex. You have to install a full TEX package, apart from this it is quite excellent. J.Pietschmann - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Preventing a block from splitting
Mete Kural wrote: Hello, I have a question. With what implemented functionality of FOP, can I prevent a block from splitting into two pages but kept intact. For instance, I want all paragraphs to be completely in one page, and not split into two pages. How can I do that? Search the list archive for keep-together. The property does not work on a block, you'll have to put your block into a blind table. An archive search will reveal all details. J.Pietschmann - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: keep-together implementation
J.Pietschmann [EMAIL PROTECTED]: Try passivetex. You have to install a full TEX package, apart from this it is quite excellent. Doesn't it also have problems with keep-* attributes? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes Slash.java
pbwest 2002/07/03 17:37:06
Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
Slash.java
Log:
Added toString()
Revision ChangesPath
No revision
No revision
1.1.2.2 +7 -3 xml-fop/src/org/apache/fop/datatypes/Attic/Slash.java
Index: Slash.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Slash.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Slash.java21 Jun 2002 15:44:02 - 1.1.2.1
+++ Slash.java4 Jul 2002 00:37:06 - 1.1.2.2
@@ -49,6 +49,10 @@
super(propertyName);
}
+public String toString() {
+return /;
+}
+
/**
* Validation not supported for ttSlash/tt.
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes MappedEnumType.java
pbwest 2002/07/03 17:42:28 Removed: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design MappedEnumType.java Log: Replaced by MappedNumeric.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyException.java
pbwest 2002/07/03 17:54:38
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyException.java
Log:
Extends FOPException, rather than Exception. Added constructor with Throwable arg.
Added ident keywords.
Revision ChangesPath
No revision
No revision
1.3.4.1 +11 -2 xml-fop/src/org/apache/fop/fo/expr/PropertyException.java
Index: PropertyException.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyException.java,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- PropertyException.java30 Jul 2001 20:29:21 - 1.3
+++ PropertyException.java4 Jul 2002 00:54:38 - 1.3.4.1
@@ -7,9 +7,18 @@
package org.apache.fop.fo.expr;
-public class PropertyException extends Exception {
+import org.apache.fop.apps.FOPException;
+
+public class PropertyException extends FOPException {
+private static final String tag = $Name$;
+private static final String revision = $Revision$;
+
public PropertyException(String detail) {
super(detail);
+}
+
+public PropertyException(Throwable e) {
+super(e);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo/expr PropertyParser.java PropertyTokenizer.java
pbwest 2002/07/03 17:59:40
Modified:src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyParser.java PropertyTokenizer.java
Log:
Added ident keywords
Revision ChangesPath
No revision
No revision
1.5.2.6 +4 -1 xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java
Index: PropertyParser.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -r1.5.2.5 -r1.5.2.6
--- PropertyParser.java 26 Jun 2002 15:55:37 - 1.5.2.5
+++ PropertyParser.java 4 Jul 2002 00:59:40 - 1.5.2.6
@@ -49,6 +49,9 @@
*/
public class PropertyParser extends PropertyTokenizer {
+private static final String tag = $Name$;
+private static final String revision = $Revision$;
+
/**
* This is an attempt to ensure that the restriction on the application of
* from-parent() and from-nearest-specified-value() functions to shorthand
1.4.4.3 +4 -1 xml-fop/src/org/apache/fop/fo/expr/PropertyTokenizer.java
Index: PropertyTokenizer.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/PropertyTokenizer.java,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -u -r1.4.4.2 -r1.4.4.3
--- PropertyTokenizer.java23 Jun 2002 15:02:18 - 1.4.4.2
+++ PropertyTokenizer.java4 Jul 2002 00:59:40 - 1.4.4.3
@@ -19,6 +19,9 @@
*/
class PropertyTokenizer {
+private static final String tag = $Name$;
+private static final String revision = $Revision$;
+
/*
* Maintain the numbering of this list in (X)Emacs by issuing
* a shell command on the region with replacement (M-1 M-|). Use
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo PropertySets.java
pbwest 2002/07/03 18:25:53
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertySets.java
Log:
Changed derivation of initial value for initialValueExpansion
Revision ChangesPath
No revision
No revision
1.1.2.8 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java
Index: PropertySets.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- PropertySets.java 28 Jun 2002 03:24:42 - 1.1.2.7
+++ PropertySets.java 4 Jul 2002 01:25:53 - 1.1.2.8
@@ -748,8 +748,8 @@
for (int i = 0; i expansion.length; i++) {
int expandedProp = expansion.get(i);
PropertyValue expandedPropValue;
-PropertyValue specified =
-foTree.getInitialValue(expandedProp).getSpecified();
+PropertyValue specified
+= foTree.getInitialSpecifiedValue(expandedProp);
// The PropertyValue must be cloneable
try {
expandedPropValue = (PropertyValue)(specified.clone());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/datatypes MappedNumeric.java
pbwest 2002/07/03 18:57:17 Modified:src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design MappedNumeric.java Log: Method name change in FOTree: getMappedNumValue to getMappedNumArrayValue Revision ChangesPath No revision No revision 1.1.2.2 +7 -7 xml-fop/src/org/apache/fop/datatypes/Attic/MappedNumeric.java Index: MappedNumeric.java === RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/MappedNumeric.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- MappedNumeric.java30 Jun 2002 16:49:26 - 1.1.2.1 +++ MappedNumeric.java4 Jul 2002 01:57:17 - 1.1.2.2 @@ -36,8 +36,8 @@ * @param property the ttint/tt index of the property on which * this value is being defined. * @param enumText the ttString/tt containing the enumeration text. + * @param foTree the ttFOTree/tt being built * An iNCName/i. - * @param foTree the ttFOTree/tt which is being built. * @exception PropertyException */ public MappedNumeric(int property, String enumText, FOTree foTree) @@ -46,15 +46,15 @@ // Set property index in AbstractPropertyValue // and enumValue enum constant in EnumType super(property, enumText); -mappedNum = foTree.getMappedNumValue(property, enumValue); +mappedNum = foTree.getMappedNumArrayValue(property, enumValue); } /** * @param propertyName the ttString/tt name of the property on which * this value is being defined. * @param enumText the ttString/tt containing the enumeration text. + * @param foTree the ttFOTree/tt being built * An iNCName/i. - * @param foTree the ttFOTree/tt which is being built. * @exception PropertyException */ public MappedNumeric(String propertyName, String enumText, FOTree foTree) @@ -63,7 +63,7 @@ // Set property index in AbstractPropertyValue // and enumValue enum constant in EnumType super(propertyName, enumText); -mappedNum = foTree.getMappedNumValue(property, enumValue); +mappedNum = foTree.getMappedNumArrayValue(property, enumValue); } /** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/org/apache/fop/fo FOTree.java
pbwest 2002/07/03 19:18:33
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java
Log:
Removed borderCommonWidthMap. Added general mappedNumericArrays for handling
MappedNumeric types. Added support functions for mappedNumericArrays. Added
generation of mappedNumArrays through PropertyConsts.mappedNumMethods. Moved
derivation and stscking of initial values into PropertyCOnsts.initialValueMethods
array, accessing individual property getInitialValue metods.
Revision ChangesPath
No revision
No revision
1.1.2.5 +58 -130 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FOTree.java 30 Jun 2002 16:52:44 - 1.1.2.4
+++ FOTree.java 4 Jul 2002 02:18:33 - 1.1.2.5
@@ -2,6 +2,7 @@
import org.apache.fop.datastructs.Tree;
import org.apache.fop.datastructs.SyncedCircularBuffer;
+import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.Numeric;
import org.apache.fop.datatypes.Auto;
import org.apache.fop.datatypes.None;
@@ -51,14 +52,6 @@
private static final String revision = $Revision$;
/**
- * A ttNumeric[]/tt array of the values to which the
- * emBorderCommonWidth/em MappedNumeric enumeration tokens map.
- * These values are used in common by the various border-?-width
- * properties.
- */
-private Numeric[] borderCommonWidthMap = null;
-
-/**
* The buffer from which the ttXMLEvent/tts from the parser will
* be read. ttprotected/tt so that FONode can access it.
*/
@@ -84,10 +77,18 @@
protected LinkedList[] propertyStacks;
/**
+ * A ttHashMap/tt of arrays of ttNumeric[]/tt keyed on the
+ * index of properties which support MAPPED_NUMERIC data types.
+ */
+private HashMap mappedNumericArrays = new HashMap();
+
+/**
* @param xmlevents the buffer from which ttXMLEvent/tts from the
* parser are read.
*/
-public FOTree(SyncedCircularBuffer xmlevents) {
+public FOTree(SyncedCircularBuffer xmlevents)
+throws PropertyException
+{
super();
errorDump = Configuration.getBooleanValue(debugMode).booleanValue();
this.xmlevents = xmlevents;
@@ -101,38 +102,11 @@
// be resolved relative to the current font size. This may happen
// during setup of initial values.
try {
-try {
-// Set the initial value
-propertyStacks[PropNames.FONT_SIZE].addLast
-(new PropertyTriplet
- (PropNames.FONT_SIZE,
- (PropertyValue)
- (((Method)
-(PropertyConsts
- .initialValueMethods.get(PropNames.FONT_SIZE)
- )
-)
- .invoke(null, new Object[]{this})
- )
- )
- );
-}
-catch (IllegalArgumentException e) {
-throw new RuntimeException(
-Illegal argument on \ + e.getMessage()
-+ \ in class FontSize);
-}
-catch (IllegalAccessException e) {
-throw new RuntimeException(
-Illegal access on \ + e.getMessage()
-+ \ in class FontSize);
-}
-catch (InvocationTargetException e) {
-Throwable targetex = e.getTargetException();
-throw new RuntimeException(
-Invocation target exception on \
-+ targetex.getMessage() + \ in class FontSize);
-}
+// Set the initial value
+propertyStacks[PropNames.FONT_SIZE].addLast
+(new PropertyTriplet
+ (PropNames.FONT_SIZE,
+ PropertyConsts.getInitialValue(PropNames.FONT_SIZE)));
PropertyValue prop =
getInitialSpecifiedValue(PropNames.FONT_SIZE);
if ( ! (prop instanceof Numeric)
@@ -151,98 +125,38 @@
String cname = ;
if (i == PropNames.FONT_SIZE) continue;
try {
-Class vclass = (Class)(PropertyConsts.propertyClasses.get(i));
-cname = vclass.getName();
// Set up the initial values for each property
-// Note that initial
cvs commit: xml-fop/src/org/apache/fop/fo PropertyConsts.java
pbwest 2002/07/03 19:34:37
Modified:src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
Log:
Removed handling of MappedEnumType. Removed initialValueMethods array and its usage.
Initial values now derived on demand by invoking the getInitialValue method of each
property through the property Class objects.
Revision ChangesPath
No revision
No revision
1.1.2.4 +45 -67xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PropertyConsts.java 30 Jun 2002 16:52:44 - 1.1.2.3
+++ PropertyConsts.java 4 Jul 2002 02:34:37 - 1.1.2.4
@@ -119,6 +119,33 @@
}
/**
+ * @param property ttint/tt index of the property
+ * @return ttPropertyValue/tt from property's igetInitialValue/i
+ * method
+ * @exception ttPropertyException/tt
+ */
+public static PropertyValue getInitialValue(int property)
+throws PropertyException
+{
+Method method = null;
+try {
+method = classes[property].getMethod
+(getInitialValue, new Class[] {int.class});
+return (PropertyValue)
+(method.invoke
+ (null, new Object[] {Ints.consts.get(property)}));
+} catch (NoSuchMethodException nsme) {
+throw new PropertyException
+(No getInitialValue method in
+ + classes[property].getName() + : + nsme.getMessage());
+} catch (IllegalAccessException iae) {
+throw new PropertyException(iae.getMessage());
+} catch (InvocationTargetException ite) {
+throw new PropertyException(ite.getMessage());
+}
+}
+
+/**
* @param property String name of the FO property
* @return int type of inheritance for this property
* (See constants defined in Properties.)
@@ -274,35 +301,6 @@
}
/**
- * @param property ttint/tt property index.
- * @param enumIndex int containing the enumeration index.
- * @return ttString/tt containing the mapped enumeration value.
- * @exception PropertyException
- */
-public static String getMappedEnumValue(int property, int enumIndex)
-throws PropertyException
-{
-// Get the object represented by the enumMappings field in the
-// property class
-Object values;
-try {
-values =
-classes[property].getField(enumMappings).get(null);
-}
-catch (NoSuchFieldException e) {
-throw new PropertyException(
-Missing field \ + e.getMessage() + \
-+ in class + classNames[property]);
-}
-catch (IllegalAccessException e) {
-throw new PropertyException(
-Illegal access on \ + e.getMessage() + \ in class +
-classNames[property]);
-}
-return enumIndexToMapping(enumIndex, (ROStringArray)values);
-}
-
-/**
* A String[] array of the property class names. This array is
* effectively 1-based, with the first element being unused.
* The array is initialized in a static initializer by converting the FO
@@ -348,12 +346,6 @@
private static final HashMap toIndex;
/**
- * An unmodifiable Map of property name to property index. It is derived
- * from the ttHashMap/tt toIndex, above.
- */
-//public static final Map propertyToIndex;
-
-/**
* A HashMap whose elements are an integer index value keyed by the name
* of a property class. the index value is the index of the property
* class name in the classNames[] array. It is initialized in a
@@ -361,12 +353,6 @@
*/
private static final HashMap classToIndex;
-/**
- * An unmodifiable Map of property class name to property index. It is
- * derived from the ttHashMap/tt classToIndex, above.
- */
-//public static final Map propertyClassToIndex;
-
/** p
* An int[] array of values specifying the type of inheritance of a
* property. The array is indexed by the index value constants that are
@@ -456,22 +442,18 @@
public static final List complexMethods;
/**
- * A sparsely populated array of ttMethod/tt objects. Although this
- * array has a slot for every property, only positions corresponding to
- * properties
AW: AW: [REDESIGN] pdf changes
XREF PDF objects have to be written PHYSICALLY in ascending sequence of the PDF object ID's. This is a requirement of the present XREF handling. If tis condition is fulfilled and PDF syntax is correct, there is most likely a length in error. Page viewport in PDF is the /Cropbox Cropbox: x = left page marging y = bottom page margin width = page size - left margin - right margin height = page height - top margin - bottom margin o The page margins have to be passed to the renderer. o Coordinates are relative to the crop box (to be checked): the renderer has to adjust. Hansuli Anderegg, Zurich - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
