Author: vhennebert
Date: Mon Oct 12 17:39:53 2009
New Revision: 824439
URL: http://svn.apache.org/viewvc?rev=824439&view=rev
Log:
Switched parameters of separateTextElements and beginTextObjectAccess, for
consistency with saveGraphicsState and beginMarkedContentSequence
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFPainter.java
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java?rev=824439&r1=824438&r2=824439&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFContentGenerator.java
Mon Oct 12 17:39:53 2009
@@ -219,10 +219,10 @@
/**
* used for accessibility, separates 2 text elements
- * @param mcid of new text element
* @param structElemType of parent of new text element
+ * @param mcid of new text element
*/
- protected void separateTextElements(int mcid, String structElemType) {
+ protected void separateTextElements(String structElemType, int mcid) {
textutil.endTextObject();
endMarkedContentSequence();
beginMarkedContentSequence(structElemType, mcid);
@@ -235,7 +235,7 @@
*/
public void separateTextElementFromLeader() {
if (!inArtifactMode) {
- separateTextElements(0, null);
+ separateTextElements(null, 0);
}
}
@@ -248,10 +248,10 @@
/**
* Accessibility beginTextObject
- * @param mcid of text element
* @param structElemType of parent
+ * @param mcid of text element
*/
- protected void beginTextObjectAccess(int mcid, String structElemType) {
+ protected void beginTextObjectAccess(String structElemType, int mcid) {
if (!textutil.isInTextObject()) {
beginMarkedContentSequence(structElemType, mcid);
textutil.beginTextObject();
@@ -262,7 +262,7 @@
* Accessibility begin of LeaderTextObject
*/
public void beginLeaderTextObject() {
- beginTextObjectAccess(0, null);
+ beginTextObjectAccess(null, 0);
}
/** Indicates the end of a text object. */
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFPainter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFPainter.java?rev=824439&r1=824438&r2=824439&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFPainter.java
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/PDFPainter.java
Mon Oct 12 17:39:53 2009
@@ -301,10 +301,10 @@
if (ptr != null && ptr.length() > 0) {
MarkedContentInfo mci =
logicalStructureHandler.addTextContentItem(ptr);
if (generator.getTextUtil().isInTextObject()) {
- generator.separateTextElements(mci.mcid, mci.tag);
+ generator.separateTextElements(mci.tag, mci.mcid);
}
generator.updateColor(state.getTextColor(), true, null);
- generator.beginTextObjectAccess(mci.mcid, mci.tag);
+ generator.beginTextObjectAccess(mci.tag, mci.mcid);
} else {
// <fo:leader leader-pattern="use-content">
// Leader content is marked as "/Artifact"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
