aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/fo/FOText.java
Commit message (Collapse)AuthorAgeFilesLines
* Changed license headers and updated NOTICE file according to: ↵Jeremias Maerki2006-07-281-5/+6
| | | | | | http://www.apache.org/legal/src-headers.html git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@426576 13f79535-47bb-0310-9956-ffa450edef68
* Bugzilla #38946:Jeremias Maerki2006-05-031-4/+4
| | | | | | | First step for improved color handling. FOP's own ColorType was replaced with java.awt.Color throughout the codebase. Submitted by: Max Berger <max.at.berger.name> git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@399185 13f79535-47bb-0310-9956-ffa450edef68
* Fixed various white space (non)removal issues during line building. ↵Manuel Mall2006-04-081-1/+10
| | | | | | white-space-treatment is now supported properly especially for the "preserve" case. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@392488 13f79535-47bb-0310-9956-ffa450edef68
* New method: FONode.decorateWithContextInfo() adds context information to an ↵Jeremias Maerki2005-12-131-0/+9
| | | | | | | | | | | error or log message by either providing the locator information or by gathering context information from the context FOs. Improved log and error messages in a number of places by adding additional context information that should make it easier to find the location in the source files. Added a check to detect inline overflows (LineLayoutManager). Added a check to detect in-page overflows (PageBreakingAlgorithm). git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@356592 13f79535-47bb-0310-9956-ffa450edef68
* Updated from Jakarta Commons IO 1.0 to 1.1. CopyUtils.copy() becomes ↵Jeremias Maerki2005-11-141-4/+4
| | | | | | | | | IOUtils.copy() again. CopyUtils in 1.0 was not ideal design decision. Fixed most of the unappropriate System.err/System.out/Exception.printStackTrace(). Those that aren't fixed and are not legitimate calls (in main() methods etc.) are marked with a TODO item. Some Javadocs and style updates. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@344111 13f79535-47bb-0310-9956-ffa450edef68
* Made the FO tree a little more consistent by renaming getName() to ↵Jeremias Maerki2005-11-111-2/+13
| | | | | | getLocalName() and adding additional methods like: getNamespaceURI() and getNormalNamespacePrefix(). getName() now returns the fully qualified name combined from getLocalName() and getNormalNamespacePrefix(). For special cases you can call getName(String) to return a different namespace prefix. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@332545 13f79535-47bb-0310-9956-ffa450edef68
* Cleanup of unused imports.Finn Bock2005-09-011-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@265738 13f79535-47bb-0310-9956-ffa450edef68
* Fixed the use of Length property for baseline-shift.Finn Bock2005-08-301-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@264890 13f79535-47bb-0310-9956-ffa450edef68
* added support for superscript and subscriptPeter Herweg2005-08-301-0/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@264863 13f79535-47bb-0310-9956-ffa450edef68
* No more warnings about unexpected FOText inside markers.Jeremias Maerki2005-07-181-1/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@219464 13f79535-47bb-0310-9956-ffa450edef68
* Removed functionality for collecting words reverted. Instead made sure ↵Jeremias Maerki2005-06-091-3/+113
| | | | | | capitalize only converts to upper case and not the other way around. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198735 13f79535-47bb-0310-9956-ffa450edef68
* Improvement for FOText instance creation. The text is consolidated into ↵Jeremias Maerki2005-06-091-11/+24
| | | | | | | | | single FOText nodes instead of multiple ones due to multiple SAX characters() calls. This fixes some of the layout engine tests that failed in certain environments. Submitted by: "Hock Szabolcs" <Hock.Szabolcs.at.t-online.co.hu> git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198724 13f79535-47bb-0310-9956-ffa450edef68
* Obsolete code removed and text-transform behaviour changed based on input ↵Jeremias Maerki2005-05-271-112/+2
| | | | | | from Victor Mote: http://marc.theaimsgroup.com/?t=111718934800001&r=1&w=2 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198698 13f79535-47bb-0310-9956-ffa450edef68
* toString() workJeremias Maerki2005-01-261-2/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198320 13f79535-47bb-0310-9956-ffa450edef68
* First version of text-decoration support (no colors, yet, PDF rendering may ↵Jeremias Maerki2005-01-251-9/+20
| | | | | | | | | | not be optimal, yet, but the rest seems to work) This change may kill what text-decoration support already was in the RTF renderer. This will need to be fixed later. Some javadoc and style touch-ups. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198314 13f79535-47bb-0310-9956-ffa450edef68
* This patch implements a pluggable LayoutManagers system, accordingSimon Pepping2004-12-241-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | to the ideas of Finn Bock and his patch in bug 30500. Created a LayoutManagerMaker interface, with method makeLayoutManagers(FONode, List), and two convenience methods on top of it. Created an implementation: LayoutManagerMapping. This is along the pattern of FOElementMapping. It creates a Map from FObj class to Maker objects. There are many static inner classes which are subclasses of Maker. Each subclass implements its own version of the make method. FOUserAgent has a setter and getter for LayoutManagerMakerOverride. AreaTreeHandler creates a LayoutManagerMaker, taking the user's override into account, using LayoutManagerMapping as the default. It has a get method for it. The LayoutManager interface has a get method for the AreaTreeHandler object, a reference to which is held in PageSequenceLM, the top of the LM tree. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198208 13f79535-47bb-0310-9956-ffa450edef68
* Fixed the NPE for fo:title in FOText.createBlockPointers by returningSimon Pepping2004-12-221-3/+5
| | | | | | | | | | | | | early. Fixed the absence of output for fo:title: In ContentLM.fillArea, replace curLM.getNextBreakPoss with getNextKnuthElements, BreakPossIter with KnuthPossIter. Copied the line parameter calculations from LineLM.makeLineBreakPosition. This is only a rough patch: leaders, external graphics, page numbers cause null pointer exceptions. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198206 13f79535-47bb-0310-9956-ffa450edef68
* PR:Glen Mazza2004-11-241-6/+6
| | | | | | | | | | | | Obtained from: Submitted by: Reviewed by: 1.) Removed unneeded enumeration interfaces from fo.Constants. 2.) Appended EN_ to enumeration constants to make them better S&R'able throughout app. 3.) Added an EN_INHERIT enumeration constant (although not currently used in the system.) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198175 13f79535-47bb-0310-9956-ffa450edef68
* New exception hierarchy rooted in SAXException and throw clauses onFinn Bock2004-10-281-1/+2
| | | | | | | | | property parsing and retrieval. PR: 31899 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198106 13f79535-47bb-0310-9956-ffa450edef68
* Third phase of performance improvement.Finn Bock2004-10-191-4/+1
| | | | | | | | | - Remove use of TextInfo. PR: 31699 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198068 13f79535-47bb-0310-9956-ffa450edef68
* Second phase of performance improvement.Finn Bock2004-10-191-15/+13
| | | | | | | | | - Pass in a PropertyList to addCharacters() PR: 31699 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198059 13f79535-47bb-0310-9956-ffa450edef68
* First phase of performance improvement. Added bind() and startOfNode()Finn Bock2004-10-191-0/+82
| | | | | | | | | methods to the FO nodes, unused for now. PR: 31699 git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198054 13f79535-47bb-0310-9956-ffa450edef68
* PR:Glen Mazza2004-10-131-9/+1
| | | | | | | | | | Obtained from: Submitted by: Reviewed by: Some simplifications allowed as a result of having FOText extend FONode directly. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198042 13f79535-47bb-0310-9956-ffa450edef68
* Endlich habe ich dem Insekt gefunden! Jetzt kann FOText das Kind von FONode ↵Glen Mazza2004-10-131-1/+1
| | | | | | werden! ^u^ git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198041 13f79535-47bb-0310-9956-ffa450edef68
* PR:Glen Mazza2004-10-121-7/+7
| | | | | | | | | | | | | | | | | | | | Obtained from: Submitted by: Reviewed by: Start of work to move FOText from extending FObj to extending FONode instead. All work is done except for changing FObj's parent from FObj to FONode. The RTF library works fine with the switch, but simple.fo and franklin_alt.fo (among others I guess) will not work properly when FOText's parent is switched. (Layout problems occur--lines don't break properly with the switch.) Switch to super() constructor (instead of super(fobj) one) within within TextLayoutManager, as it is not needed for this subclass, also to facilitate the change above. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198040 13f79535-47bb-0310-9956-ffa450edef68
* PR:Glen Mazza2004-09-191-1/+1
| | | | | | | | | | | | | | Obtained from: Submitted by: Reviewed by: 1.) Removed unused getTitle() within AreaTreeModel; I believe can be obtained from fo.pagination.PageSequence object where needed. 2.) Combined AbstractCharIterator and CharIterator interface into single abstract CharIterator class. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197952 13f79535-47bb-0310-9956-ffa450edef68
* Removed tab characters.Jeremias Maerki2004-09-111-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197939 13f79535-47bb-0310-9956-ffa450edef68
* 1. Moved getNameId() from FObj to FONode.Glen Mazza2004-08-181-0/+4
| | | | | | | | | | | 2. Centralized determination of generatesInlineAreas() from multiple FObj subclasses into fo.PropertySets BitSet object. 3. validateChildNode() implemented for fo:list-item. 4. fo:initial-property-set now extending FObj instead of ToBeImplementedElement; burden of implementation on individual FOInputHandler subclasses. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197882 13f79535-47bb-0310-9956-ffa450edef68
* PR:Glen Mazza2004-08-061-1/+1
| | | | | | | | | | Obtained from: Submitted by: Reviewed by: Moved three FO's from AddLMVisitor->FObj.AddLayoutManager(); will eventually need to create additional LM's for at least two of them to remove the Area-specific code these FO's now have. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197858 13f79535-47bb-0310-9956-ffa450edef68
* PR:Glen Mazza2004-08-061-6/+7
| | | | | | | | | | | | Obtained from: Submitted by: Reviewed by: 1.) Continued conversion/deprecation of AddLMVisitor. About 16 FO's remaining. 2.) Created a *temporary* LMVisited interface to mark those FO's still needing conversion. This will be dropped once the process is complete. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197857 13f79535-47bb-0310-9956-ffa450edef68
* 1. validation for fo:basic-link addedGlen Mazza2004-07-311-11/+13
| | | | | | | | | | | 2. "name" data element removed from FONode, added to its XMLObj subclass (FObj subclasses' getName() uses a string constant instead.) 3. isBlockOrInlineItem() convenience method added to FObj 4. setup() methods within FO's switched to private access. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197846 13f79535-47bb-0310-9956-ffa450edef68
* Removed the FOTreeVisitor interface in favor of a moreGlen Mazza2004-07-271-5/+5
| | | | | | | | direct connection to (the subclassable) AddLMVisitor in the FO's. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197845 13f79535-47bb-0310-9956-ffa450edef68
* Comments added.Glen Mazza2004-04-061-1/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197492 13f79535-47bb-0310-9956-ffa450edef68
* Another attempt at fixing the space removal issue. This methodGlen Mazza2004-04-041-43/+73
| | | | | | | | | | | | combines the long-standing previous method (the one that removed spaces between words correctly, at a cost of a leading extra space for the first FOText instance of an fo:block) with my later patch (which would fix the extra space issue but had problems with spaces between words). It appears to work well, but the fo:inline issues Simon brought up will still need further work. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197489 13f79535-47bb-0310-9956-ffa450edef68
* Simplifications to FOText whitespace removal; fewer arraycopies performed.Glen Mazza2004-03-121-26/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197443 13f79535-47bb-0310-9956-ffa450edef68
* Fix of leading-space problem in HEAD. (A single leading space of the firstGlen Mazza2004-03-071-4/+0
| | | | | | | inline child of the block object was being incorrectly retained.) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197421 13f79535-47bb-0310-9956-ffa450edef68
* 1.) Modified TextLayoutManager to take an additional lengthGlen Mazza2004-03-011-2/+11
| | | | | | | | | | | | | | parameter, indicating the maximum valid index of the passed-in character array. 2.) Removed from AddLMVisitor (which calls the above class), the re-fitting of the FOText character array to the size of the maximum valid index. 3.) Various small cleanup issues. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197402 13f79535-47bb-0310-9956-ffa450edef68
* Applied Apache License Version 2.0 by following the instructions at ↵Jeremias Maerki2004-02-271-48/+16
| | | | | | http://www.apache.org/dev/apply-license.html. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197384 13f79535-47bb-0310-9956-ffa450edef68
* Some simplification of FOText object.Glen Mazza2004-02-271-9/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197383 13f79535-47bb-0310-9956-ffa450edef68
* Moved the interfaces into the Constants class on a trial basis (we may stillGlen Mazza2004-01-171-2/+0
| | | | | | | | | | | | choose to remove them in favor of strictly using Constants.) Two interfaces (span and position) were removed because of conflicts with other class names. The interface generation was moved into Constants.xsl, which is run manually via the XsltToJava ant task and its output is then checked in. As a result, no more autogeneration of these interfaces at build time will be done. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197213 13f79535-47bb-0310-9956-ffa450edef68
* 1. convert fo/FOTreeVisitor to an interfaceWilliam Victor Mote2003-09-161-1/+1
| | | | | | | 2. give all FOTreeVisitor methods a unique name (instead of overloading) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196913 13f79535-47bb-0310-9956-ffa450edef68
* Remove all storage of fo/FOInputHandler from within the FO Tree itself, in ↵William Victor Mote2003-09-021-6/+1
| | | | | | favor of storing it one time in apps/Document and getting it from there when needed. Makes everything cleaner, and uses less memory, at the probable expense of some processing time (to go up the tree to get to Document). git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196887 13f79535-47bb-0310-9956-ffa450edef68
* 1. remove unused fieldWilliam Victor Mote2003-08-221-5/+17
| | | | | | | 2. some checkstyle/javadoc changes git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196823 13f79535-47bb-0310-9956-ffa450edef68
* 1. Remove fo/FOTreeExternal and layoutmgr/LMFOTreeExternal (in favor of ↵William Victor Mote2003-08-191-19/+6
| | | | | | | | | | Visitor concept, see item 2) 2. Add fo/FOTreeVisitor and layoutmgr/AddLMVisitor 3. Remove all occurrences of addLayoutManager in fo/FObj subclasses, replacing them with equivalent methods in AddLMVisitor git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196809 13f79535-47bb-0310-9956-ffa450edef68
* rename StructureHandler to FOInputHandler to clarify that its subclasses are ↵William Victor Mote2003-07-291-3/+3
| | | | | | handling data for output that is either structured or laid out git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196756 13f79535-47bb-0310-9956-ffa450edef68
* style changes onlyWilliam Victor Mote2003-07-171-31/+49
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196725 13f79535-47bb-0310-9956-ffa450edef68
* Bug #20397: Move StructureHandler.java to fo package and LayoutHandler.java ↵Glen Mazza2003-06-291-1/+0
| | | | | | to layoutmgr package. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196538 13f79535-47bb-0310-9956-ffa450edef68
* javadoc changes to clean up gump warnings.William Victor Mote2003-04-251-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196344 13f79535-47bb-0310-9956-ffa450edef68
* Eliminate array looping if text-transform is NONE for a probable performance ↵William Victor Mote2003-03-261-0/+3
| | | | | | benefit. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196142 13f79535-47bb-0310-9956-ffa450edef68
* Add support for text-transform.William Victor Mote2003-03-251-17/+323
| | | | git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196141 13f79535-47bb-0310-9956-ffa450edef68