gmazza 2005/01/31 14:27:20
Modified: src/java/org/apache/fop/fo Constants.java
FOElementMapping.java PropertySets.java
Added: src/java/org/apache/fop/fo/pagination
PageSequenceWrapper.java
Log:
Addition of new fo:page-sequence-wrapper FO from XSL 1.1. Currently not
"plugged in" (it is commented out in FOElementMapping) nor functionally
implemented.
Revision Changes Path
1.25 +9 -6 xml-fop/src/java/org/apache/fop/fo/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Constants.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Constants.java 11 Jan 2005 00:07:52 -0000 1.24
+++ Constants.java 31 Jan 2005 22:27:19 -0000 1.25
@@ -113,10 +113,11 @@
int FO_TABLE_ROW = 54;
int FO_TITLE = 55;
int FO_WRAPPER = 56;
- int FO_BOOKMARK_TREE = 57;
- int FO_BOOKMARK = 58;
- int FO_BOOKMARK_TITLE = 59;
- int FRM_OBJ_COUNT = 59;
+ int FO_BOOKMARK_TREE = 57; // XSL 1.1
+ int FO_BOOKMARK = 58; // XSL 1.1
+ int FO_BOOKMARK_TITLE = 59; // XSL 1.1
+ int FO_PAGE_SEQUENCE_WRAPPER = 60; // XSL 1.1
+ int FRM_OBJ_COUNT = 60;
// Masks
int COMPOUND_SHIFT = 9;
@@ -372,7 +373,9 @@
int PR_XML_LANG = 245;
int PR_Z_INDEX = 246;
int PR_INTRUSION_DISPLACE = 247;
- int PROPERTY_COUNT = 247;
+ int PR_INDEX_CLASS = 248; // XSL 1.1
+ int PR_INDEX_KEY = 249; // XSL 1.1
+ int PROPERTY_COUNT = 249;
// compound property constants
1.12 +8 -1 xml-fop/src/java/org/apache/fop/fo/FOElementMapping.java
Index: FOElementMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOElementMapping.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FOElementMapping.java 6 Jan 2005 00:56:25 -0000 1.11
+++ FOElementMapping.java 31 Jan 2005 22:27:19 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@
foObjs.put("bookmark-tree", new BookmarkTreeMaker());
foObjs.put("bookmark", new BookmarkMaker());
foObjs.put("bookmark-title", new BookmarkTitleMaker());
+// foObjs.put("page-sequence-wrapper", new
PageSequenceWrapperMaker());
foObjs.put("page-sequence", new PageSequenceMaker());
foObjs.put("layout-master-set", new LayoutMasterSetMaker());
foObjs.put("page-sequence-master",
@@ -166,6 +167,12 @@
}
}
+ static class PageSequenceWrapperMaker extends ElementMapping.Maker {
+ public FONode make(FONode parent) {
+ return new
org.apache.fop.fo.pagination.PageSequenceWrapper(parent);
+ }
+ }
+
static class PageSequenceMaker extends ElementMapping.Maker {
public FONode make(FONode parent) {
return new org.apache.fop.fo.pagination.PageSequence(parent);
1.17 +6 -1 xml-fop/src/java/org/apache/fop/fo/PropertySets.java
Index: PropertySets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertySets.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PropertySets.java 11 Jan 2005 00:07:52 -0000 1.16
+++ PropertySets.java 31 Jan 2005 22:27:19 -0000 1.17
@@ -216,6 +216,11 @@
elem.addProperty(Constants.PR_FONT_STYLE);
elem.addProperty(Constants.PR_FONT_WEIGHT);
+ elem = elements[Constants.FO_PAGE_SEQUENCE_WRAPPER];
+ elem.addProperty(Constants.PR_ID);
+ elem.addProperty(Constants.PR_INDEX_CLASS);
+ elem.addProperty(Constants.PR_INDEX_KEY);
+
elem = elements[Constants.FO_PAGE_SEQUENCE];
elem.addProperty(Constants.PR_COUNTRY);
elem.addProperty(Constants.PR_FORMAT);
1.1
xml-fop/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java
Index: PageSequenceWrapper.java
===================================================================
/*
* Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed 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: PageSequenceWrapper.java,v 1.1 2005/01/31 22:27:20 gmazza Exp $ */
package org.apache.fop.fo.pagination;
// Java
import java.util.List;
import java.util.ListIterator;
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
/**
* The fo:page-sequence-wrapper formatting object, first introduced
* in the XSL 1.1 WD. Prototype version only, subject to change as
* XSL 1.1 WD evolves.
*/
public class PageSequenceWrapper extends FObj {
// The value of properties relevant for this FO
private String id;
private String indexClass;
private String indexKey;
// End of property values
/**
* @param parent FONode that is the parent of this object
*/
public PageSequenceWrapper(FONode parent) {
super(parent);
}
/**
* @see org.apache.fop.fo.FObj#bind(PropertyList)
*/
public void bind(PropertyList pList) throws FOPException {
id = pList.get(PR_ID).getString();
indexClass = pList.get(PR_INDEX_CLASS).getString();
indexKey = pList.get(PR_INDEX_KEY).getString();
}
/**
* @see org.apache.fop.fo.FONode#startOfNode
*/
protected void startOfNode() throws FOPException {
checkId(id);
}
/**
* @see org.apache.fop.fo.FONode#validateChildNode(Locator, String,
String)
XSL/FOP: (bookmark+)
*/
protected void validateChildNode(Locator loc, String nsURI, String
localName)
throws ValidationException {
if (!(nsURI == FO_URI && (localName.equals("page-sequence") ||
localName.equals("page-sequence-wrapper")))) {
invalidChildError(loc, nsURI, localName);
}
}
/**
* Return the "id" property.
*/
public String getId() {
return id;
}
/**
* Return the "id" property.
*/
public String getIndexClass() {
return indexClass;
}
/**
* Return the "id" property.
*/
public String getIndexKey() {
return indexKey;
}
/**
* @see org.apache.fop.fo.FObj#getName()
*/
public String getName() {
return "fo:page-sequence-wrapper";
}
/**
* @see org.apache.fop.fo.FObj#getNameId()
*/
public int getNameId() {
return FO_PAGE_SEQUENCE_WRAPPER;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
