foray-commit Mailing List for FOray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
|
1
|
|
2
|
3
|
4
|
5
|
6
|
7
|
8
|
|
9
|
10
|
11
|
12
|
13
(3) |
14
(13) |
15
(20) |
|
16
|
17
|
18
(14) |
19
(2) |
20
(3) |
21
|
22
|
|
23
|
24
|
25
(1) |
26
(14) |
27
(12) |
28
(7) |
29
(5) |
|
30
(4) |
|
|
|
|
|
|
|
From: <vic...@us...> - 2006-04-30 18:54:53
|
Revision: 7103 Author: victormote Date: 2006-04-30 11:54:44 -0700 (Sun, 30 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7103&view=rev Log Message: ----------- Fix bad links, in some cases by creating some content. Modified Paths: -------------- trunk/foray/doc/web/00-rsrc/include/leftmenu-module.html trunk/foray/doc/web/project/heritage.html Added Paths: ----------- trunk/foray/doc/web/module/layout/ trunk/foray/doc/web/module/layout/index.html Modified: trunk/foray/doc/web/00-rsrc/include/leftmenu-module.html =================================================================== --- trunk/foray/doc/web/00-rsrc/include/leftmenu-module.html 2006-04-30 18:13:09 UTC (rev 7102) +++ trunk/foray/doc/web/00-rsrc/include/leftmenu-module.html 2006-04-30 18:54:44 UTC (rev 7103) @@ -23,7 +23,7 @@ </tr> <tr class="BigMenuUnselected"> <td class="BigMenuUnselected"> - <a class="BigMenuUnselected" href="/dev/index.html">Developers</a> + <a class="BigMenuUnselected" href="/dev/">Developers</a> </td> </tr> </table> @@ -32,13 +32,13 @@ <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/index.html">Modules Home</a> + <a class="Menu" href="/module/">Modules Home</a> </td> </tr> <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/app/index.html">The FOray Application</a> + <a class="Menu" href="/module/app/">The FOray Application</a> </td> </tr> <tr> @@ -47,45 +47,51 @@ <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/common/index.html">FOrayCommon</a> + <a class="Menu" href="/module/common/">FOrayCommon</a> </td> </tr> <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/ps/index.html">FOrayPS</a> + <a class="Menu" href="/module/ps/">FOrayPS</a> </td> </tr> <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/graphic/index.html">FOrayGraphic</a> + <a class="Menu" href="/module/graphic/">FOrayGraphic</a> </td> </tr> <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/font/index.html">FOrayFont</a> + <a class="Menu" href="/module/font/">FOrayFont</a> </td> </tr> <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/text/index.html">FOrayText</a> + <a class="Menu" href="/module/text/">FOrayText</a> </td> </tr> <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/pdf/index.html">FOrayPDF</a> + <a class="Menu" href="/module/pdf/">FOrayPDF</a> </td> </tr> <tr> <td class="Bullet1"> </td> <td class="Menu1"> - <a class="Menu" href="/module/fotree/index.html">FOrayFOTree</a> + <a class="Menu" href="/module/fotree/">FOrayFOTree</a> </td> </tr> + <tr> + <td class="Bullet1"> </td> + <td class="Menu1"> + <a class="Menu" href="/module/layout/">The FOray Layout Systems</a> + </td> + </tr> </table> Added: trunk/foray/doc/web/module/layout/index.html =================================================================== --- trunk/foray/doc/web/module/layout/index.html (rev 0) +++ trunk/foray/doc/web/module/layout/index.html 2006-04-30 18:54:44 UTC (rev 7103) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + +<head> + <title>FOray Modules: The FOray Layout Strategies</title> + <meta name="content-revised" + content="$Date$"/> + <!--#include virtual="/00-rsrc/include/standard-head.html" --> +</head> + +<body> +<!--#include virtual="/00-rsrc/include/leftmenu-module.html" --> + +<h1>FOray Modules: The FOray Layout Strategies</h1> +<h2>Contents</h2> +<ul> + <li><a href="#intro">Introduction</a></li> + <li><a href="#mode">Mode: Eager or Patient</a></li> + <li><a href="#pioneer">Pioneer Layout Strategy</a></li> +</ul> + +<h2><a name="intro">Introduction</a></h2> +<p>The layout strategies are sets of classes suitable for taking an FOTree as +input and laying it out into an AreaTree.</p> + +<h2><a name="mode">Mode: Eager or Patient</a></h2> + +<h2><a name="pioneer">Pioneer Layout Strategy</a></h2> +<p>Pioneer is the first and currently only Layout Strategy that can be used +with FOray.</p> + +<!--#include virtual="/00-rsrc/include/leftmenu-end.html" --> +</body> +</html> Property changes on: trunk/foray/doc/web/module/layout/index.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Modified: trunk/foray/doc/web/project/heritage.html =================================================================== --- trunk/foray/doc/web/project/heritage.html 2006-04-30 18:13:09 UTC (rev 7102) +++ trunk/foray/doc/web/project/heritage.html 2006-04-30 18:54:44 UTC (rev 7103) @@ -28,10 +28,10 @@ </ul> <h2><a name="intro">Introduction</a></h2> -<p>FOray is a fork of the <a href="http://xml.apache.org/fop/" +<p>FOray is a fork of the <a href="http://xmlgraphics.apache.org/fop/" rel="external">Apache FOP</a> project. FOP is an XSL-FO layout engine with a good, usable core -codebase. According to the <a href="http://xml.apache.org/fop/status.html" +codebase. According to the <a href="http://xmlgraphics.apache.org/fop/status.html" rel="external">FOP Status Page</a>, development on the working branch of FOP was halted on October 22, 2001. At that point, all developers were expected to focus This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-30 18:13:54
|
Revision: 7102 Author: victormote Date: 2006-04-30 11:13:09 -0700 (Sun, 30 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7102&view=rev Log Message: ----------- 1. Fix remaining validation problems. 2. Add XML declaration to each document. Modified Paths: -------------- trunk/foray/doc/web/app/features/extensions.html trunk/foray/doc/web/app/features/graphics.html trunk/foray/doc/web/app/resources/other.html trunk/foray/doc/web/app/using/anttask.html trunk/foray/doc/web/app/using/build.html trunk/foray/doc/web/app/using/configuration.html trunk/foray/doc/web/app/using/download.html trunk/foray/doc/web/app/using/release.html trunk/foray/doc/web/app/using/run.html trunk/foray/doc/web/app/using/start.html trunk/foray/doc/web/dev/admin/doc.html trunk/foray/doc/web/dev/admin/release.html trunk/foray/doc/web/dev/areatree/index.html trunk/foray/doc/web/dev/extensions.html trunk/foray/doc/web/dev/font/encoding.html trunk/foray/doc/web/dev/font/index.html trunk/foray/doc/web/dev/font/planning.html trunk/foray/doc/web/dev/fotree/index.html trunk/foray/doc/web/dev/index.html trunk/foray/doc/web/dev/layout/index.html trunk/foray/doc/web/dev/pdf/index.html trunk/foray/doc/web/dev/ps/index.html trunk/foray/doc/web/dev/text/index.html trunk/foray/doc/web/index.html trunk/foray/doc/web/module/app/index.html trunk/foray/doc/web/module/common/index.html trunk/foray/doc/web/module/font/index.html trunk/foray/doc/web/module/fotree/index.html trunk/foray/doc/web/module/graphic/index.html trunk/foray/doc/web/module/pdf/index.html trunk/foray/doc/web/module/ps/index.html trunk/foray/doc/web/module/text/index.html trunk/foray/doc/web/project/goals.html trunk/foray/doc/web/project/help.html trunk/foray/doc/web/project/heritage.html trunk/foray/doc/web/project/team.html Modified: trunk/foray/doc/web/app/features/extensions.html =================================================================== --- trunk/foray/doc/web/app/features/extensions.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/features/extensions.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/app/features/graphics.html =================================================================== --- trunk/foray/doc/web/app/features/graphics.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/features/graphics.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/app/resources/other.html =================================================================== --- trunk/foray/doc/web/app/resources/other.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/resources/other.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,4 +1,5 @@ -<!DOCTYPE html +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -142,7 +143,7 @@ Formatting Objects</a>, by Dave Pawson. See hardcopy version below.</li> <li>[book] <a rel="external" href="http://www.oreilly.com/catalog/xslfo">XSL-FO</a>, by Dave Pawson, -O’Reilly & Associates, 2002, ISBN 0-596-00355-2. See online version +O'Reilly & Associates, 2002, ISBN 0-596-00355-2. See online version above.</li> <li>[book] <a rel="external" href="http://www.phptr.com/browse/product.asp?product_id={CEA527AF-412D-49DA-8C1F-46E0A519B8D8}">Definitive @@ -168,10 +169,10 @@ by Michael H. Kay, Wrox Press, ISBN 1-861-00506-7.</li> <li>[book] <a rel="external" href="http://www.oreilly.com/catalog/xslt">XSLT</a>, by Doug Tidwell, -O’Reilly & Associates, 2001, ISBN 0-596-00053-7.</li> +O'Reilly & Associates, 2001, ISBN 0-596-00053-7.</li> <li>[book] <a rel="external" href="http://www.oreilly.com/catalog/xsltckbk">XSLT Cookbook</a>, by Sal -Mangano, O’Reilly & Associates, 2002, ISBN 0-596-00372-2.</li> +Mangano, O'Reilly & Associates, 2002, ISBN 0-596-00372-2.</li> <li>[article] <a rel="external" href="http://www.dpawson.co.uk/xsl/xslfaq.html">Dave Pawson's XSL FAQ</a>.</li> <li>[book] <a rel="external" @@ -184,7 +185,7 @@ 0-471-41620-7.</li> <li>[book] <a rel="external" href="http://www.oreilly.com/catalog/javaxslt">Java and XSLT</a>, by Eric M. -Burke, O’Reilly & Associates, 2001, ISBN 0-596-00143-6.</li> +Burke, O'Reilly & Associates, 2001, ISBN 0-596-00143-6.</li> </ul> @@ -199,14 +200,14 @@ See online version above.</li> <li>[online resource] A great number of additional XML-related books and articles can be found at the <a rel="external" -href="http://xml.oreilly.com">O’Reilly XML Site</a>.</li> +href="http://xml.oreilly.com">O'Reilly XML Site</a>.</li> </ul> <h3><a name="documents-java">Java</a></h3> <ul> <li>[online resource] A great number of Java-related books and articles can -be found at the <a rel="external" href="http://java.oreilly.com">O’Reilly Java +be found at the <a rel="external" href="http://java.oreilly.com">O'Reilly Java Site</a>.</li> </ul> Modified: trunk/foray/doc/web/app/using/anttask.html =================================================================== --- trunk/foray/doc/web/app/using/anttask.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/using/anttask.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/app/using/build.html =================================================================== --- trunk/foray/doc/web/app/using/build.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/using/build.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/app/using/configuration.html =================================================================== --- trunk/foray/doc/web/app/using/configuration.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/using/configuration.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/app/using/download.html =================================================================== --- trunk/foray/doc/web/app/using/download.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/using/download.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/app/using/release.html =================================================================== --- trunk/foray/doc/web/app/using/release.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/using/release.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -138,7 +139,7 @@ facilitate making these options available on the command line.</li> <li>A boolean configuration option <strong>cache-graphics</strong> was added. -It defaults to “false\xE2\x80?. +It defaults to “false�?. If set to true, graphic objects will be cached and can be reused, resulting in potential speed improvement. If set to false, graphic objects are not reused, resulting in potential memory @@ -219,14 +220,14 @@ applications that built the font metrics files):</p> <ul> - <li><strong>font-resource</strong> (was the “-er\xE2\x80? [embed-resource] + <li><strong>font-resource</strong> (was the “-er�? [embed-resource] command-line option). Font files can be included in fop.jar when building fop. Both font-resource and font-file can be specified for the same font, but if font-file is specified and can be opened, it will take precedence over font-resource. Please note that the companion option -ef already exists in the font configuration file as <strong>embed-file</strong> (now called <strong>font-file</strong>).</li> - <li><strong>embed-name</strong> (was the “-fn\xE2\x80? command-line option). If + <li><strong>embed-name</strong> (was the “-fn�? command-line option). If embed-name is specified, it will be used as the name of the font in the output document, if the font is embedded in that document. This is sometimes useful when trying to @@ -235,7 +236,7 @@ <i>not </i>specified, FOray first attempts to extract and embed the name from the font itself. If that fails, it uses the configured attribute <strong>name</strong>.</li> - <li><strong>ttc-name</strong> (was the “-ttcname\xE2\x80? command-line option. + <li><strong>ttc-name</strong> (was the “-ttcname�? command-line option. If you are reading data from a TrueType Collection (.ttc file) you must specify which font from the collection you will read metrics from.</li> @@ -251,7 +252,7 @@ <strong>embed-resource</strong>. Since those attributes have been renamed to clarify their use, you must now explicitly state what embedding behavior is desired. Valid options -are “all\xE2\x80?, “subset\xE2\x80?, and “none\xE2\x80?. The default is “none\xE2\x80?.</li> +are “all�?, “subset�?, and “none�?. The default is “none�?.</li> </ul> <p>In addition, the following changes related to the direct parsing of font files @@ -262,13 +263,13 @@ configuration file. This is currently not used at all, except as a fallback name to be embedded in an output file if no other name can be found. Its main purpose is for reference in writing and parsing the configuration file, but it -may be used as a “key\xE2\x80? for other configuration elements in the future.</li> +may be used as a “key�? for other configuration elements in the future.</li> <li>The former attribute <strong>embed-file</strong> for the element <strong>font</strong> in the font configuration file, has been renamed to <strong>font-file</strong>. This change was made for clarity since, for some font types, the font file contains both the embedding information and the metrics information.</li> - <li>Note that the former TTFReader command-line option “-enc\xE2\x80? has no + <li>Note that the former TTFReader command-line option “-enc�? has no analog in the configuration file. The artifical reencoding that this option enabled is no longer necessary now that CID fonts are properly embedded in the PDF output (see change below regarding ToUnicode CMap).</li> @@ -276,9 +277,9 @@ <h4>Other Changes</h4> <ul> - <li>Since we have now obtained rights to the internet domain “foray.org\xE2\x80?, the -package structure of all FOray module classes has been moved from “com.outfitr\xE2\x80? -to “org.foray\xE2\x80?. The package structure for fop-maint remains unchanged.</li> + <li>Since we have now obtained rights to the internet domain “foray.org�?, the +package structure of all FOray module classes has been moved from “com.outfitr�? +to “org.foray�?. The package structure for fop-maint remains unchanged.</li> <li>Starting with Release 0.2, FOray requires a minimum java runtime environment of 1.4.</li> <li><em>All</em> properties should now be supported at the parse level, @@ -287,7 +288,7 @@ note that this does not mean that all properties are used or used properly by the layout or rendering systems.</li> <li>The class for running FOray from the command-line has been renamed -“FOray\xE2\x80?.</li> +“FOray�?.</li> <li>The outer-layer application API has changed significantly. This will not affect command-line users, but will affect anyone running FOray embedded within another application. Details of the new API can be found at <a @@ -337,7 +338,7 @@ FOray’s reference FO processing implementation is currently unable to use this method because of such concurrent processing.</li> <li>To assist in parsing Type1 fonts, FOray now has the modest beginnings of -a PostScript interpreter emulation. It is included as part of the new “FOrayPS\xE2\x80? +a PostScript interpreter emulation. It is included as part of the new “FOrayPS�? module. We hope to use this for future project such as embedding EPS files in PDF output.</li> <li>The filter and encoding classes that were part of the pdf module have Modified: trunk/foray/doc/web/app/using/run.html =================================================================== --- trunk/foray/doc/web/app/using/run.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/using/run.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/app/using/start.html =================================================================== --- trunk/foray/doc/web/app/using/start.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/app/using/start.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/admin/doc.html =================================================================== --- trunk/foray/doc/web/dev/admin/doc.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/admin/doc.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/admin/release.html =================================================================== --- trunk/foray/doc/web/dev/admin/release.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/admin/release.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/areatree/index.html =================================================================== --- trunk/foray/doc/web/dev/areatree/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/areatree/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/extensions.html =================================================================== --- trunk/foray/doc/web/dev/extensions.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/extensions.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/font/encoding.html =================================================================== --- trunk/foray/doc/web/dev/font/encoding.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/font/encoding.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/font/index.html =================================================================== --- trunk/foray/doc/web/dev/font/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/font/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/font/planning.html =================================================================== --- trunk/foray/doc/web/dev/font/planning.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/font/planning.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/fotree/index.html =================================================================== --- trunk/foray/doc/web/dev/fotree/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/fotree/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/index.html =================================================================== --- trunk/foray/doc/web/dev/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/layout/index.html =================================================================== --- trunk/foray/doc/web/dev/layout/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/layout/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/pdf/index.html =================================================================== --- trunk/foray/doc/web/dev/pdf/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/pdf/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/ps/index.html =================================================================== --- trunk/foray/doc/web/dev/ps/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/ps/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/dev/text/index.html =================================================================== --- trunk/foray/doc/web/dev/text/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/dev/text/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/index.html =================================================================== --- trunk/foray/doc/web/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/module/app/index.html =================================================================== --- trunk/foray/doc/web/module/app/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/module/app/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/module/common/index.html =================================================================== --- trunk/foray/doc/web/module/common/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/module/common/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/module/font/index.html =================================================================== --- trunk/foray/doc/web/module/font/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/module/font/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/module/fotree/index.html =================================================================== --- trunk/foray/doc/web/module/fotree/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/module/fotree/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/module/graphic/index.html =================================================================== --- trunk/foray/doc/web/module/graphic/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/module/graphic/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/module/pdf/index.html =================================================================== --- trunk/foray/doc/web/module/pdf/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/module/pdf/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/module/ps/index.html =================================================================== --- trunk/foray/doc/web/module/ps/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/module/ps/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/module/text/index.html =================================================================== --- trunk/foray/doc/web/module/text/index.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/module/text/index.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/project/goals.html =================================================================== --- trunk/foray/doc/web/project/goals.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/project/goals.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/project/help.html =================================================================== --- trunk/foray/doc/web/project/help.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/project/help.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/project/heritage.html =================================================================== --- trunk/foray/doc/web/project/heritage.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/project/heritage.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> Modified: trunk/foray/doc/web/project/team.html =================================================================== --- trunk/foray/doc/web/project/team.html 2006-04-30 18:01:54 UTC (rev 7101) +++ trunk/foray/doc/web/project/team.html 2006-04-30 18:13:09 UTC (rev 7102) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-30 18:02:15
|
Revision: 7101 Author: victormote Date: 2006-04-30 11:01:54 -0700 (Sun, 30 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7101&view=rev Log Message: ----------- 1. Add XHTML DTD to repository. 2. Add Ant task to validate web content. 3. Clean up validation problems in some web content. Modified Paths: -------------- trunk/foray/doc/web/app/features/fonts.html trunk/foray/doc/web/app/features/other.html trunk/foray/scripts/build.xml Added Paths: ----------- trunk/foray/doc/dtd/ trunk/foray/doc/dtd/xhtml-lat1.ent trunk/foray/doc/dtd/xhtml-special.ent trunk/foray/doc/dtd/xhtml-symbol.ent trunk/foray/doc/dtd/xhtml1-strict-readme.txt trunk/foray/doc/dtd/xhtml1-strict.dtd Added: trunk/foray/doc/dtd/xhtml-lat1.ent =================================================================== --- trunk/foray/doc/dtd/xhtml-lat1.ent (rev 0) +++ trunk/foray/doc/dtd/xhtml-lat1.ent 2006-04-30 18:01:54 UTC (rev 7101) @@ -0,0 +1,196 @@ +<!-- Portions (C) International Organization for Standardization 1986 + Permission to copy in any form is granted for use with + conforming SGML systems and applications as defined in + ISO 8879, provided this notice is included in all copies. +--> +<!-- Character entity set. Typical invocation: + <!ENTITY % HTMLlat1 PUBLIC + "-//W3C//ENTITIES Latin 1 for XHTML//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent"> + %HTMLlat1; +--> + +<!ENTITY nbsp " "> <!-- no-break space = non-breaking space, + U+00A0 ISOnum --> +<!ENTITY iexcl "¡"> <!-- inverted exclamation mark, U+00A1 ISOnum --> +<!ENTITY cent "¢"> <!-- cent sign, U+00A2 ISOnum --> +<!ENTITY pound "£"> <!-- pound sign, U+00A3 ISOnum --> +<!ENTITY curren "¤"> <!-- currency sign, U+00A4 ISOnum --> +<!ENTITY yen "¥"> <!-- yen sign = yuan sign, U+00A5 ISOnum --> +<!ENTITY brvbar "¦"> <!-- broken bar = broken vertical bar, + U+00A6 ISOnum --> +<!ENTITY sect "§"> <!-- section sign, U+00A7 ISOnum --> +<!ENTITY uml "¨"> <!-- diaeresis = spacing diaeresis, + U+00A8 ISOdia --> +<!ENTITY copy "©"> <!-- copyright sign, U+00A9 ISOnum --> +<!ENTITY ordf "ª"> <!-- feminine ordinal indicator, U+00AA ISOnum --> +<!ENTITY laquo "«"> <!-- left-pointing double angle quotation mark + = left pointing guillemet, U+00AB ISOnum --> +<!ENTITY not "¬"> <!-- not sign = angled dash, + U+00AC ISOnum --> +<!ENTITY shy "­"> <!-- soft hyphen = discretionary hyphen, + U+00AD ISOnum --> +<!ENTITY reg "®"> <!-- registered sign = registered trade mark sign, + U+00AE ISOnum --> +<!ENTITY macr "¯"> <!-- macron = spacing macron = overline + = APL overbar, U+00AF ISOdia --> +<!ENTITY deg "°"> <!-- degree sign, U+00B0 ISOnum --> +<!ENTITY plusmn "±"> <!-- plus-minus sign = plus-or-minus sign, + U+00B1 ISOnum --> +<!ENTITY sup2 "²"> <!-- superscript two = superscript digit two + = squared, U+00B2 ISOnum --> +<!ENTITY sup3 "³"> <!-- superscript three = superscript digit three + = cubed, U+00B3 ISOnum --> +<!ENTITY acute "´"> <!-- acute accent = spacing acute, + U+00B4 ISOdia --> +<!ENTITY micro "µ"> <!-- micro sign, U+00B5 ISOnum --> +<!ENTITY para "¶"> <!-- pilcrow sign = paragraph sign, + U+00B6 ISOnum --> +<!ENTITY middot "·"> <!-- middle dot = Georgian comma + = Greek middle dot, U+00B7 ISOnum --> +<!ENTITY cedil "¸"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia --> +<!ENTITY sup1 "¹"> <!-- superscript digit one, + U+00B9 ISOnum --> +<!ENTITY ordm "º"> <!-- masculine ordinal indicator, + U+00BA ISOnum --> +<!ENTITY raquo "»"> <!-- right-pointing double angle quotation mark + = right pointing guillemet, U+00BB ISOnum --> +<!ENTITY frac14 "¼"> <!-- vulgar fraction one quarter + = fraction one quarter, U+00BC ISOnum --> +<!ENTITY frac12 "½"> <!-- vulgar fraction one half + = fraction one half, U+00BD ISOnum --> +<!ENTITY frac34 "¾"> <!-- vulgar fraction three quarters + = fraction three quarters, U+00BE ISOnum --> +<!ENTITY iquest "¿"> <!-- inverted question mark + = turned question mark, U+00BF ISOnum --> +<!ENTITY Agrave "À"> <!-- latin capital letter A with grave + = latin capital letter A grave, + U+00C0 ISOlat1 --> +<!ENTITY Aacute "Á"> <!-- latin capital letter A with acute, + U+00C1 ISOlat1 --> +<!ENTITY Acirc "Â"> <!-- latin capital letter A with circumflex, + U+00C2 ISOlat1 --> +<!ENTITY Atilde "Ã"> <!-- latin capital letter A with tilde, + U+00C3 ISOlat1 --> +<!ENTITY Auml "Ä"> <!-- latin capital letter A with diaeresis, + U+00C4 ISOlat1 --> +<!ENTITY Aring "Å"> <!-- latin capital letter A with ring above + = latin capital letter A ring, + U+00C5 ISOlat1 --> +<!ENTITY AElig "Æ"> <!-- latin capital letter AE + = latin capital ligature AE, + U+00C6 ISOlat1 --> +<!ENTITY Ccedil "Ç"> <!-- latin capital letter C with cedilla, + U+00C7 ISOlat1 --> +<!ENTITY Egrave "È"> <!-- latin capital letter E with grave, + U+00C8 ISOlat1 --> +<!ENTITY Eacute "É"> <!-- latin capital letter E with acute, + U+00C9 ISOlat1 --> +<!ENTITY Ecirc "Ê"> <!-- latin capital letter E with circumflex, + U+00CA ISOlat1 --> +<!ENTITY Euml "Ë"> <!-- latin capital letter E with diaeresis, + U+00CB ISOlat1 --> +<!ENTITY Igrave "Ì"> <!-- latin capital letter I with grave, + U+00CC ISOlat1 --> +<!ENTITY Iacute "Í"> <!-- latin capital letter I with acute, + U+00CD ISOlat1 --> +<!ENTITY Icirc "Î"> <!-- latin capital letter I with circumflex, + U+00CE ISOlat1 --> +<!ENTITY Iuml "Ï"> <!-- latin capital letter I with diaeresis, + U+00CF ISOlat1 --> +<!ENTITY ETH "Ð"> <!-- latin capital letter ETH, U+00D0 ISOlat1 --> +<!ENTITY Ntilde "Ñ"> <!-- latin capital letter N with tilde, + U+00D1 ISOlat1 --> +<!ENTITY Ograve "Ò"> <!-- latin capital letter O with grave, + U+00D2 ISOlat1 --> +<!ENTITY Oacute "Ó"> <!-- latin capital letter O with acute, + U+00D3 ISOlat1 --> +<!ENTITY Ocirc "Ô"> <!-- latin capital letter O with circumflex, + U+00D4 ISOlat1 --> +<!ENTITY Otilde "Õ"> <!-- latin capital letter O with tilde, + U+00D5 ISOlat1 --> +<!ENTITY Ouml "Ö"> <!-- latin capital letter O with diaeresis, + U+00D6 ISOlat1 --> +<!ENTITY times "×"> <!-- multiplication sign, U+00D7 ISOnum --> +<!ENTITY Oslash "Ø"> <!-- latin capital letter O with stroke + = latin capital letter O slash, + U+00D8 ISOlat1 --> +<!ENTITY Ugrave "Ù"> <!-- latin capital letter U with grave, + U+00D9 ISOlat1 --> +<!ENTITY Uacute "Ú"> <!-- latin capital letter U with acute, + U+00DA ISOlat1 --> +<!ENTITY Ucirc "Û"> <!-- latin capital letter U with circumflex, + U+00DB ISOlat1 --> +<!ENTITY Uuml "Ü"> <!-- latin capital letter U with diaeresis, + U+00DC ISOlat1 --> +<!ENTITY Yacute "Ý"> <!-- latin capital letter Y with acute, + U+00DD ISOlat1 --> +<!ENTITY THORN "Þ"> <!-- latin capital letter THORN, + U+00DE ISOlat1 --> +<!ENTITY szlig "ß"> <!-- latin small letter sharp s = ess-zed, + U+00DF ISOlat1 --> +<!ENTITY agrave "à"> <!-- latin small letter a with grave + = latin small letter a grave, + U+00E0 ISOlat1 --> +<!ENTITY aacute "á"> <!-- latin small letter a with acute, + U+00E1 ISOlat1 --> +<!ENTITY acirc "â"> <!-- latin small letter a with circumflex, + U+00E2 ISOlat1 --> +<!ENTITY atilde "ã"> <!-- latin small letter a with tilde, + U+00E3 ISOlat1 --> +<!ENTITY auml "ä"> <!-- latin small letter a with diaeresis, + U+00E4 ISOlat1 --> +<!ENTITY aring "å"> <!-- latin small letter a with ring above + = latin small letter a ring, + U+00E5 ISOlat1 --> +<!ENTITY aelig "æ"> <!-- latin small letter ae + = latin small ligature ae, U+00E6 ISOlat1 --> +<!ENTITY ccedil "ç"> <!-- latin small letter c with cedilla, + U+00E7 ISOlat1 --> +<!ENTITY egrave "è"> <!-- latin small letter e with grave, + U+00E8 ISOlat1 --> +<!ENTITY eacute "é"> <!-- latin small letter e with acute, + U+00E9 ISOlat1 --> +<!ENTITY ecirc "ê"> <!-- latin small letter e with circumflex, + U+00EA ISOlat1 --> +<!ENTITY euml "ë"> <!-- latin small letter e with diaeresis, + U+00EB ISOlat1 --> +<!ENTITY igrave "ì"> <!-- latin small letter i with grave, + U+00EC ISOlat1 --> +<!ENTITY iacute "í"> <!-- latin small letter i with acute, + U+00ED ISOlat1 --> +<!ENTITY icirc "î"> <!-- latin small letter i with circumflex, + U+00EE ISOlat1 --> +<!ENTITY iuml "ï"> <!-- latin small letter i with diaeresis, + U+00EF ISOlat1 --> +<!ENTITY eth "ð"> <!-- latin small letter eth, U+00F0 ISOlat1 --> +<!ENTITY ntilde "ñ"> <!-- latin small letter n with tilde, + U+00F1 ISOlat1 --> +<!ENTITY ograve "ò"> <!-- latin small letter o with grave, + U+00F2 ISOlat1 --> +<!ENTITY oacute "ó"> <!-- latin small letter o with acute, + U+00F3 ISOlat1 --> +<!ENTITY ocirc "ô"> <!-- latin small letter o with circumflex, + U+00F4 ISOlat1 --> +<!ENTITY otilde "õ"> <!-- latin small letter o with tilde, + U+00F5 ISOlat1 --> +<!ENTITY ouml "ö"> <!-- latin small letter o with diaeresis, + U+00F6 ISOlat1 --> +<!ENTITY divide "÷"> <!-- division sign, U+00F7 ISOnum --> +<!ENTITY oslash "ø"> <!-- latin small letter o with stroke, + = latin small letter o slash, + U+00F8 ISOlat1 --> +<!ENTITY ugrave "ù"> <!-- latin small letter u with grave, + U+00F9 ISOlat1 --> +<!ENTITY uacute "ú"> <!-- latin small letter u with acute, + U+00FA ISOlat1 --> +<!ENTITY ucirc "û"> <!-- latin small letter u with circumflex, + U+00FB ISOlat1 --> +<!ENTITY uuml "ü"> <!-- latin small letter u with diaeresis, + U+00FC ISOlat1 --> +<!ENTITY yacute "ý"> <!-- latin small letter y with acute, + U+00FD ISOlat1 --> +<!ENTITY thorn "þ"> <!-- latin small letter thorn, + U+00FE ISOlat1 --> +<!ENTITY yuml "ÿ"> <!-- latin small letter y with diaeresis, + U+00FF ISOlat1 --> Added: trunk/foray/doc/dtd/xhtml-special.ent =================================================================== --- trunk/foray/doc/dtd/xhtml-special.ent (rev 0) +++ trunk/foray/doc/dtd/xhtml-special.ent 2006-04-30 18:01:54 UTC (rev 7101) @@ -0,0 +1,80 @@ +<!-- Special characters for XHTML --> + +<!-- Character entity set. Typical invocation: + <!ENTITY % HTMLspecial PUBLIC + "-//W3C//ENTITIES Special for XHTML//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"> + %HTMLspecial; +--> + +<!-- Portions (C) International Organization for Standardization 1986: + Permission to copy in any form is granted for use with + conforming SGML systems and applications as defined in + ISO 8879, provided this notice is included in all copies. +--> + +<!-- Relevant ISO entity set is given unless names are newly introduced. + New names (i.e., not in ISO 8879 list) do not clash with any + existing ISO 8879 entity names. ISO 10646 character numbers + are given for each character, in hex. values are decimal + conversions of the ISO 10646 values and refer to the document + character set. Names are Unicode names. +--> + +<!-- C0 Controls and Basic Latin --> +<!ENTITY quot """> <!-- quotation mark, U+0022 ISOnum --> +<!ENTITY amp "&#38;"> <!-- ampersand, U+0026 ISOnum --> +<!ENTITY lt "&#60;"> <!-- less-than sign, U+003C ISOnum --> +<!ENTITY gt ">"> <!-- greater-than sign, U+003E ISOnum --> +<!ENTITY apos "'"> <!-- apostrophe = APL quote, U+0027 ISOnum --> + +<!-- Latin Extended-A --> +<!ENTITY OElig "Œ"> <!-- latin capital ligature OE, + U+0152 ISOlat2 --> +<!ENTITY oelig "œ"> <!-- latin small ligature oe, U+0153 ISOlat2 --> +<!-- ligature is a misnomer, this is a separate character in some languages --> +<!ENTITY Scaron "Š"> <!-- latin capital letter S with caron, + U+0160 ISOlat2 --> +<!ENTITY scaron "š"> <!-- latin small letter s with caron, + U+0161 ISOlat2 --> +<!ENTITY Yuml "Ÿ"> <!-- latin capital letter Y with diaeresis, + U+0178 ISOlat2 --> + +<!-- Spacing Modifier Letters --> +<!ENTITY circ "ˆ"> <!-- modifier letter circumflex accent, + U+02C6 ISOpub --> +<!ENTITY tilde "˜"> <!-- small tilde, U+02DC ISOdia --> + +<!-- General Punctuation --> +<!ENTITY ensp " "> <!-- en space, U+2002 ISOpub --> +<!ENTITY emsp " "> <!-- em space, U+2003 ISOpub --> +<!ENTITY thinsp " "> <!-- thin space, U+2009 ISOpub --> +<!ENTITY zwnj "‌"> <!-- zero width non-joiner, + U+200C NEW RFC 2070 --> +<!ENTITY zwj "‍"> <!-- zero width joiner, U+200D NEW RFC 2070 --> +<!ENTITY lrm "‎"> <!-- left-to-right mark, U+200E NEW RFC 2070 --> +<!ENTITY rlm "‏"> <!-- right-to-left mark, U+200F NEW RFC 2070 --> +<!ENTITY ndash "–"> <!-- en dash, U+2013 ISOpub --> +<!ENTITY mdash "—"> <!-- em dash, U+2014 ISOpub --> +<!ENTITY lsquo "‘"> <!-- left single quotation mark, + U+2018 ISOnum --> +<!ENTITY rsquo "’"> <!-- right single quotation mark, + U+2019 ISOnum --> +<!ENTITY sbquo "‚"> <!-- single low-9 quotation mark, U+201A NEW --> +<!ENTITY ldquo "“"> <!-- left double quotation mark, + U+201C ISOnum --> +<!ENTITY rdquo "”"> <!-- right double quotation mark, + U+201D ISOnum --> +<!ENTITY bdquo "„"> <!-- double low-9 quotation mark, U+201E NEW --> +<!ENTITY dagger "†"> <!-- dagger, U+2020 ISOpub --> +<!ENTITY Dagger "‡"> <!-- double dagger, U+2021 ISOpub --> +<!ENTITY permil "‰"> <!-- per mille sign, U+2030 ISOtech --> +<!ENTITY lsaquo "‹"> <!-- single left-pointing angle quotation mark, + U+2039 ISO proposed --> +<!-- lsaquo is proposed but not yet ISO standardized --> +<!ENTITY rsaquo "›"> <!-- single right-pointing angle quotation mark, + U+203A ISO proposed --> +<!-- rsaquo is proposed but not yet ISO standardized --> + +<!-- Currency Symbols --> +<!ENTITY euro "€"> <!-- euro sign, U+20AC NEW --> Added: trunk/foray/doc/dtd/xhtml-symbol.ent =================================================================== --- trunk/foray/doc/dtd/xhtml-symbol.ent (rev 0) +++ trunk/foray/doc/dtd/xhtml-symbol.ent 2006-04-30 18:01:54 UTC (rev 7101) @@ -0,0 +1,237 @@ +<!-- Mathematical, Greek and Symbolic characters for XHTML --> + +<!-- Character entity set. Typical invocation: + <!ENTITY % HTMLsymbol PUBLIC + "-//W3C//ENTITIES Symbols for XHTML//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"> + %HTMLsymbol; +--> + +<!-- Portions (C) International Organization for Standardization 1986: + Permission to copy in any form is granted for use with + conforming SGML systems and applications as defined in + ISO 8879, provided this notice is included in all copies. +--> + +<!-- Relevant ISO entity set is given unless names are newly introduced. + New names (i.e., not in ISO 8879 list) do not clash with any + existing ISO 8879 entity names. ISO 10646 character numbers + are given for each character, in hex. values are decimal + conversions of the ISO 10646 values and refer to the document + character set. Names are Unicode names. +--> + +<!-- Latin Extended-B --> +<!ENTITY fnof "ƒ"> <!-- latin small letter f with hook = function + = florin, U+0192 ISOtech --> + +<!-- Greek --> +<!ENTITY Alpha "Α"> <!-- greek capital letter alpha, U+0391 --> +<!ENTITY Beta "Β"> <!-- greek capital letter beta, U+0392 --> +<!ENTITY Gamma "Γ"> <!-- greek capital letter gamma, + U+0393 ISOgrk3 --> +<!ENTITY Delta "Δ"> <!-- greek capital letter delta, + U+0394 ISOgrk3 --> +<!ENTITY Epsilon "Ε"> <!-- greek capital letter epsilon, U+0395 --> +<!ENTITY Zeta "Ζ"> <!-- greek capital letter zeta, U+0396 --> +<!ENTITY Eta "Η"> <!-- greek capital letter eta, U+0397 --> +<!ENTITY Theta "Θ"> <!-- greek capital letter theta, + U+0398 ISOgrk3 --> +<!ENTITY Iota "Ι"> <!-- greek capital letter iota, U+0399 --> +<!ENTITY Kappa "Κ"> <!-- greek capital letter kappa, U+039A --> +<!ENTITY Lambda "Λ"> <!-- greek capital letter lamda, + U+039B ISOgrk3 --> +<!ENTITY Mu "Μ"> <!-- greek capital letter mu, U+039C --> +<!ENTITY Nu "Ν"> <!-- greek capital letter nu, U+039D --> +<!ENTITY Xi "Ξ"> <!-- greek capital letter xi, U+039E ISOgrk3 --> +<!ENTITY Omicron "Ο"> <!-- greek capital letter omicron, U+039F --> +<!ENTITY Pi "Π"> <!-- greek capital letter pi, U+03A0 ISOgrk3 --> +<!ENTITY Rho "Ρ"> <!-- greek capital letter rho, U+03A1 --> +<!-- there is no Sigmaf, and no U+03A2 character either --> +<!ENTITY Sigma "Σ"> <!-- greek capital letter sigma, + U+03A3 ISOgrk3 --> +<!ENTITY Tau "Τ"> <!-- greek capital letter tau, U+03A4 --> +<!ENTITY Upsilon "Υ"> <!-- greek capital letter upsilon, + U+03A5 ISOgrk3 --> +<!ENTITY Phi "Φ"> <!-- greek capital letter phi, + U+03A6 ISOgrk3 --> +<!ENTITY Chi "Χ"> <!-- greek capital letter chi, U+03A7 --> +<!ENTITY Psi "Ψ"> <!-- greek capital letter psi, + U+03A8 ISOgrk3 --> +<!ENTITY Omega "Ω"> <!-- greek capital letter omega, + U+03A9 ISOgrk3 --> + +<!ENTITY alpha "α"> <!-- greek small letter alpha, + U+03B1 ISOgrk3 --> +<!ENTITY beta "β"> <!-- greek small letter beta, U+03B2 ISOgrk3 --> +<!ENTITY gamma "γ"> <!-- greek small letter gamma, + U+03B3 ISOgrk3 --> +<!ENTITY delta "δ"> <!-- greek small letter delta, + U+03B4 ISOgrk3 --> +<!ENTITY epsilon "ε"> <!-- greek small letter epsilon, + U+03B5 ISOgrk3 --> +<!ENTITY zeta "ζ"> <!-- greek small letter zeta, U+03B6 ISOgrk3 --> +<!ENTITY eta "η"> <!-- greek small letter eta, U+03B7 ISOgrk3 --> +<!ENTITY theta "θ"> <!-- greek small letter theta, + U+03B8 ISOgrk3 --> +<!ENTITY iota "ι"> <!-- greek small letter iota, U+03B9 ISOgrk3 --> +<!ENTITY kappa "κ"> <!-- greek small letter kappa, + U+03BA ISOgrk3 --> +<!ENTITY lambda "λ"> <!-- greek small letter lamda, + U+03BB ISOgrk3 --> +<!ENTITY mu "μ"> <!-- greek small letter mu, U+03BC ISOgrk3 --> +<!ENTITY nu "ν"> <!-- greek small letter nu, U+03BD ISOgrk3 --> +<!ENTITY xi "ξ"> <!-- greek small letter xi, U+03BE ISOgrk3 --> +<!ENTITY omicron "ο"> <!-- greek small letter omicron, U+03BF NEW --> +<!ENTITY pi "π"> <!-- greek small letter pi, U+03C0 ISOgrk3 --> +<!ENTITY rho "ρ"> <!-- greek small letter rho, U+03C1 ISOgrk3 --> +<!ENTITY sigmaf "ς"> <!-- greek small letter final sigma, + U+03C2 ISOgrk3 --> +<!ENTITY sigma "σ"> <!-- greek small letter sigma, + U+03C3 ISOgrk3 --> +<!ENTITY tau "τ"> <!-- greek small letter tau, U+03C4 ISOgrk3 --> +<!ENTITY upsilon "υ"> <!-- greek small letter upsilon, + U+03C5 ISOgrk3 --> +<!ENTITY phi "φ"> <!-- greek small letter phi, U+03C6 ISOgrk3 --> +<!ENTITY chi "χ"> <!-- greek small letter chi, U+03C7 ISOgrk3 --> +<!ENTITY psi "ψ"> <!-- greek small letter psi, U+03C8 ISOgrk3 --> +<!ENTITY omega "ω"> <!-- greek small letter omega, + U+03C9 ISOgrk3 --> +<!ENTITY thetasym "ϑ"> <!-- greek theta symbol, + U+03D1 NEW --> +<!ENTITY upsih "ϒ"> <!-- greek upsilon with hook symbol, + U+03D2 NEW --> +<!ENTITY piv "ϖ"> <!-- greek pi symbol, U+03D6 ISOgrk3 --> + +<!-- General Punctuation --> +<!ENTITY bull "•"> <!-- bullet = black small circle, + U+2022 ISOpub --> +<!-- bullet is NOT the same as bullet operator, U+2219 --> +<!ENTITY hellip "…"> <!-- horizontal ellipsis = three dot leader, + U+2026 ISOpub --> +<!ENTITY prime "′"> <!-- prime = minutes = feet, U+2032 ISOtech --> +<!ENTITY Prime "″"> <!-- double prime = seconds = inches, + U+2033 ISOtech --> +<!ENTITY oline "‾"> <!-- overline = spacing overscore, + U+203E NEW --> +<!ENTITY frasl "⁄"> <!-- fraction slash, U+2044 NEW --> + +<!-- Letterlike Symbols --> +<!ENTITY weierp "℘"> <!-- script capital P = power set + = Weierstrass p, U+2118 ISOamso --> +<!ENTITY image "ℑ"> <!-- black-letter capital I = imaginary part, + U+2111 ISOamso --> +<!ENTITY real "ℜ"> <!-- black-letter capital R = real part symbol, + U+211C ISOamso --> +<!ENTITY trade "™"> <!-- trade mark sign, U+2122 ISOnum --> +<!ENTITY alefsym "ℵ"> <!-- alef symbol = first transfinite cardinal, + U+2135 NEW --> +<!-- alef symbol is NOT the same as hebrew letter alef, + U+05D0 although the same glyph could be used to depict both characters --> + +<!-- Arrows --> +<!ENTITY larr "←"> <!-- leftwards arrow, U+2190 ISOnum --> +<!ENTITY uarr "↑"> <!-- upwards arrow, U+2191 ISOnum--> +<!ENTITY rarr "→"> <!-- rightwards arrow, U+2192 ISOnum --> +<!ENTITY darr "↓"> <!-- downwards arrow, U+2193 ISOnum --> +<!ENTITY harr "↔"> <!-- left right arrow, U+2194 ISOamsa --> +<!ENTITY crarr "↵"> <!-- downwards arrow with corner leftwards + = carriage return, U+21B5 NEW --> +<!ENTITY lArr "⇐"> <!-- leftwards double arrow, U+21D0 ISOtech --> +<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow + but also does not have any other character for that function. So lArr can + be used for 'is implied by' as ISOtech suggests --> +<!ENTITY uArr "⇑"> <!-- upwards double arrow, U+21D1 ISOamsa --> +<!ENTITY rArr "⇒"> <!-- rightwards double arrow, + U+21D2 ISOtech --> +<!-- Unicode does not say this is the 'implies' character but does not have + another character with this function so rArr can be used for 'implies' + as ISOtech suggests --> +<!ENTITY dArr "⇓"> <!-- downwards double arrow, U+21D3 ISOamsa --> +<!ENTITY hArr "⇔"> <!-- left right double arrow, + U+21D4 ISOamsa --> + +<!-- Mathematical Operators --> +<!ENTITY forall "∀"> <!-- for all, U+2200 ISOtech --> +<!ENTITY part "∂"> <!-- partial differential, U+2202 ISOtech --> +<!ENTITY exist "∃"> <!-- there exists, U+2203 ISOtech --> +<!ENTITY empty "∅"> <!-- empty set = null set, U+2205 ISOamso --> +<!ENTITY nabla "∇"> <!-- nabla = backward difference, + U+2207 ISOtech --> +<!ENTITY isin "∈"> <!-- element of, U+2208 ISOtech --> +<!ENTITY notin "∉"> <!-- not an element of, U+2209 ISOtech --> +<!ENTITY ni "∋"> <!-- contains as member, U+220B ISOtech --> +<!ENTITY prod "∏"> <!-- n-ary product = product sign, + U+220F ISOamsb --> +<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though + the same glyph might be used for both --> +<!ENTITY sum "∑"> <!-- n-ary summation, U+2211 ISOamsb --> +<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma' + though the same glyph might be used for both --> +<!ENTITY minus "−"> <!-- minus sign, U+2212 ISOtech --> +<!ENTITY lowast "∗"> <!-- asterisk operator, U+2217 ISOtech --> +<!ENTITY radic "√"> <!-- square root = radical sign, + U+221A ISOtech --> +<!ENTITY prop "∝"> <!-- proportional to, U+221D ISOtech --> +<!ENTITY infin "∞"> <!-- infinity, U+221E ISOtech --> +<!ENTITY ang "∠"> <!-- angle, U+2220 ISOamso --> +<!ENTITY and "∧"> <!-- logical and = wedge, U+2227 ISOtech --> +<!ENTITY or "∨"> <!-- logical or = vee, U+2228 ISOtech --> +<!ENTITY cap "∩"> <!-- intersection = cap, U+2229 ISOtech --> +<!ENTITY cup "∪"> <!-- union = cup, U+222A ISOtech --> +<!ENTITY int "∫"> <!-- integral, U+222B ISOtech --> +<!ENTITY there4 "∴"> <!-- therefore, U+2234 ISOtech --> +<!ENTITY sim "∼"> <!-- tilde operator = varies with = similar to, + U+223C ISOtech --> +<!-- tilde operator is NOT the same character as the tilde, U+007E, + although the same glyph might be used to represent both --> +<!ENTITY cong "≅"> <!-- approximately equal to, U+2245 ISOtech --> +<!ENTITY asymp "≈"> <!-- almost equal to = asymptotic to, + U+2248 ISOamsr --> +<!ENTITY ne "≠"> <!-- not equal to, U+2260 ISOtech --> +<!ENTITY equiv "≡"> <!-- identical to, U+2261 ISOtech --> +<!ENTITY le "≤"> <!-- less-than or equal to, U+2264 ISOtech --> +<!ENTITY ge "≥"> <!-- greater-than or equal to, + U+2265 ISOtech --> +<!ENTITY sub "⊂"> <!-- subset of, U+2282 ISOtech --> +<!ENTITY sup "⊃"> <!-- superset of, U+2283 ISOtech --> +<!ENTITY nsub "⊄"> <!-- not a subset of, U+2284 ISOamsn --> +<!ENTITY sube "⊆"> <!-- subset of or equal to, U+2286 ISOtech --> +<!ENTITY supe "⊇"> <!-- superset of or equal to, + U+2287 ISOtech --> +<!ENTITY oplus "⊕"> <!-- circled plus = direct sum, + U+2295 ISOamsb --> +<!ENTITY otimes "⊗"> <!-- circled times = vector product, + U+2297 ISOamsb --> +<!ENTITY perp "⊥"> <!-- up tack = orthogonal to = perpendicular, + U+22A5 ISOtech --> +<!ENTITY sdot "⋅"> <!-- dot operator, U+22C5 ISOamsb --> +<!-- dot operator is NOT the same character as U+00B7 middle dot --> + +<!-- Miscellaneous Technical --> +<!ENTITY lceil "⌈"> <!-- left ceiling = APL upstile, + U+2308 ISOamsc --> +<!ENTITY rceil "⌉"> <!-- right ceiling, U+2309 ISOamsc --> +<!ENTITY lfloor "⌊"> <!-- left floor = APL downstile, + U+230A ISOamsc --> +<!ENTITY rfloor "⌋"> <!-- right floor, U+230B ISOamsc --> +<!ENTITY lang "〈"> <!-- left-pointing angle bracket = bra, + U+2329 ISOtech --> +<!-- lang is NOT the same character as U+003C 'less than sign' + or U+2039 'single left-pointing angle quotation mark' --> +<!ENTITY rang "〉"> <!-- right-pointing angle bracket = ket, + U+232A ISOtech --> +<!-- rang is NOT the same character as U+003E 'greater than sign' + or U+203A 'single right-pointing angle quotation mark' --> + +<!-- Geometric Shapes --> +<!ENTITY loz "◊"> <!-- lozenge, U+25CA ISOpub --> + +<!-- Miscellaneous Symbols --> +<!ENTITY spades "♠"> <!-- black spade suit, U+2660 ISOpub --> +<!-- black here seems to mean filled as opposed to hollow --> +<!ENTITY clubs "♣"> <!-- black club suit = shamrock, + U+2663 ISOpub --> +<!ENTITY hearts "♥"> <!-- black heart suit = valentine, + U+2665 ISOpub --> +<!ENTITY diams "♦"> <!-- black diamond suit, U+2666 ISOpub --> Added: trunk/foray/doc/dtd/xhtml1-strict-readme.txt =================================================================== --- trunk/foray/doc/dtd/xhtml1-strict-readme.txt (rev 0) +++ trunk/foray/doc/dtd/xhtml1-strict-readme.txt 2006-04-30 18:01:54 UTC (rev 7101) @@ -0,0 +1,13 @@ +The DTD files related to XHTML 1.0 Strict were downloaded April 30, +2006 in accordance with the instructions found at the following URL: +http://www.w3.org/TR/xhtml1/#dtds + +The files so downloaded were: +xhtml1-strict.dtd +xhtml-lat1.ent +xhtml-special.ent +xhtml-symbol.ent + +Victor Mote, April 30, 2006 + +# Last Line of Memo. # Property changes on: trunk/foray/doc/dtd/xhtml1-strict-readme.txt ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/doc/dtd/xhtml1-strict.dtd =================================================================== --- trunk/foray/doc/dtd/xhtml1-strict.dtd (rev 0) +++ trunk/foray/doc/dtd/xhtml1-strict.dtd 2006-04-30 18:01:54 UTC (rev 7101) @@ -0,0 +1,978 @@ +<!-- + Extensible HTML version 1.0 Strict DTD + + This is the same as HTML 4 Strict except for + changes due to the differences between XML and SGML. + + Namespace = http://www.w3.org/1999/xhtml + + For further information, see: http://www.w3.org/TR/xhtml1 + + Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio), + All Rights Reserved. + + This DTD module is identified by the PUBLIC and SYSTEM identifiers: + + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" + + $Revision$ + $Date$ + +--> + +<!--================ Character mnemonic entities =========================--> + +<!ENTITY % HTMLlat1 PUBLIC + "-//W3C//ENTITIES Latin 1 for XHTML//EN" + "xhtml-lat1.ent"> +%HTMLlat1; + +<!ENTITY % HTMLsymbol PUBLIC + "-//W3C//ENTITIES Symbols for XHTML//EN" + "xhtml-symbol.ent"> +%HTMLsymbol; + +<!ENTITY % HTMLspecial PUBLIC + "-//W3C//ENTITIES Special for XHTML//EN" + "xhtml-special.ent"> +%HTMLspecial; + +<!--================== Imported Names ====================================--> + +<!ENTITY % ContentType "CDATA"> + <!-- media type, as per [RFC2045] --> + +<!ENTITY % ContentTypes "CDATA"> + <!-- comma-separated list of media types, as per [RFC2045] --> + +<!ENTITY % Charset "CDATA"> + <!-- a character encoding, as per [RFC2045] --> + +<!ENTITY % Charsets "CDATA"> + <!-- a space separated list of character encodings, as per [RFC2045] --> + +<!ENTITY % LanguageCode "NMTOKEN"> + <!-- a language code, as per [RFC3066] --> + +<!ENTITY % Character "CDATA"> + <!-- a single character, as per section 2.2 of [XML] --> + +<!ENTITY % Number "CDATA"> + <!-- one or more digits --> + +<!ENTITY % LinkTypes "CDATA"> + <!-- space-separated list of link types --> + +<!ENTITY % MediaDesc "CDATA"> + <!-- single or comma-separated list of media descriptors --> + +<!ENTITY % URI "CDATA"> + <!-- a Uniform Resource Identifier, see [RFC2396] --> + +<!ENTITY % UriList "CDATA"> + <!-- a space separated list of Uniform Resource Identifiers --> + +<!ENTITY % Datetime "CDATA"> + <!-- date and time information. ISO date format --> + +<!ENTITY % Script "CDATA"> + <!-- script expression --> + +<!ENTITY % StyleSheet "CDATA"> + <!-- style sheet data --> + +<!ENTITY % Text "CDATA"> + <!-- used for titles etc. --> + +<!ENTITY % Length "CDATA"> + <!-- nn for pixels or nn% for percentage length --> + +<!ENTITY % MultiLength "CDATA"> + <!-- pixel, percentage, or relative --> + +<!ENTITY % Pixels "CDATA"> + <!-- integer representing length in pixels --> + +<!-- these are used for image maps --> + +<!ENTITY % Shape "(rect|circle|poly|default)"> + +<!ENTITY % Coords "CDATA"> + <!-- comma separated list of lengths --> + +<!--=================== Generic Attributes ===============================--> + +<!-- core attributes common to most elements + id document-wide unique id + class space separated list of classes + style associated style info + title advisory title/amplification +--> +<!ENTITY % coreattrs + "id ID #IMPLIED + class CDATA #IMPLIED + style %StyleSheet; #IMPLIED + title %Text; #IMPLIED" + > + +<!-- internationalization attributes + lang language code (backwards compatible) + xml:lang language code (as per XML 1.0 spec) + dir direction for weak/neutral text +--> +<!ENTITY % i18n + "lang %LanguageCode; #IMPLIED + xml:lang %LanguageCode; #IMPLIED + dir (ltr|rtl) #IMPLIED" + > + +<!-- attributes for common UI events + onclick a pointer button was clicked + ondblclick a pointer button was double clicked + onmousedown a pointer button was pressed down + onmouseup a pointer button was released + onmousemove a pointer was moved onto the element + onmouseout a pointer was moved away from the element + onkeypress a key was pressed and released + onkeydown a key was pressed down + onkeyup a key was released +--> +<!ENTITY % events + "onclick %Script; #IMPLIED + ondblclick %Script; #IMPLIED + onmousedown %Script; #IMPLIED + onmouseup %Script; #IMPLIED + onmouseover %Script; #IMPLIED + onmousemove %Script; #IMPLIED + onmouseout %Script; #IMPLIED + onkeypress %Script; #IMPLIED + onkeydown %Script; #IMPLIED + onkeyup %Script; #IMPLIED" + > + +<!-- attributes for elements that can get the focus + accesskey accessibility key character + tabindex position in tabbing order + onfocus the element got the focus + onblur the element lost the focus +--> +<!ENTITY % focus + "accesskey %Character; #IMPLIED + tabindex %Number; #IMPLIED + onfocus %Script; #IMPLIED + onblur %Script; #IMPLIED" + > + +<!ENTITY % attrs "%coreattrs; %i18n; %events;"> + +<!--=================== Text Elements ====================================--> + +<!ENTITY % special.pre + "br | span | bdo | map"> + + +<!ENTITY % special + "%special.pre; | object | img "> + +<!ENTITY % fontstyle "tt | i | b | big | small "> + +<!ENTITY % phrase "em | strong | dfn | code | q | + samp | kbd | var | cite | abbr | acronym | sub | sup "> + +<!ENTITY % inline.forms "input | select | textarea | label | button"> + +<!-- these can occur at block or inline level --> +<!ENTITY % misc.inline "ins | del | script"> + +<!-- these can only occur at block level --> +<!ENTITY % misc "noscript | %misc.inline;"> + +<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;"> + +<!-- %Inline; covers inline or "text-level" elements --> +<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*"> + +<!--================== Block level elements ==============================--> + +<!ENTITY % heading "h1|h2|h3|h4|h5|h6"> +<!ENTITY % lists "ul | ol | dl"> +<!ENTITY % blocktext "pre | hr | blockquote | address"> + +<!ENTITY % block + "p | %heading; | div | %lists; | %blocktext; | fieldset | table"> + +<!ENTITY % Block "(%block; | form | %misc;)*"> + +<!-- %Flow; mixes block and inline and is used for list items etc. --> +<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*"> + +<!--================== Content models for exclusions =====================--> + +<!-- a elements use %Inline; excluding a --> + +<!ENTITY % a.content + "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*"> + +<!-- pre uses %Inline excluding big, small, sup or sup --> + +<!ENTITY % pre.content + "(#PCDATA | a | %fontstyle; | %phrase; | %special.pre; | %misc.inline; + | %inline.forms;)*"> + +<!-- form uses %Block; excluding form --> + +<!ENTITY % form.content "(%block; | %misc;)*"> + +<!-- button uses %Flow; but excludes a, form and form controls --> + +<!ENTITY % button.content + "(#PCDATA | p | %heading; | div | %lists; | %blocktext; | + table | %special; | %fontstyle; | %phrase; | %misc;)*"> + +<!--================ Document Structure ==================================--> + +<!-- the namespace URI designates the document profile --> + +<!ELEMENT html (head, body)> +<!ATTLIST html + %i18n; + id ID #IMPLIED + xmlns %URI; #FIXED 'http://www.w3.org/1999/xhtml' + > + +<!--================ Document Head =======================================--> + +<!ENTITY % head.misc "(script|style|meta|link|object)*"> + +<!-- content model is %head.misc; combined with a single + title and an optional base element in any order --> + +<!ELEMENT head (%head.misc;, + ((title, %head.misc;, (base, %head.misc;)?) | + (base, %head.misc;, (title, %head.misc;))))> + +<!ATTLIST head + %i18n; + id ID #IMPLIED + profile %URI; #IMPLIED + > + +<!-- The title element is not considered part of the flow of text. + It should be displayed, for example as the page header or + window title. Exactly one title is required per document. + --> +<!ELEMENT title (#PCDATA)> +<!ATTLIST title + %i18n; + id ID #IMPLIED + > + +<!-- document base URI --> + +<!ELEMENT base EMPTY> +<!ATTLIST base + href %URI; #REQUIRED + id ID #IMPLIED + > + +<!-- generic metainformation --> +<!ELEMENT meta EMPTY> +<!ATTLIST meta + %i18n; + id ID #IMPLIED + http-equiv CDATA #IMPLIED + name CDATA #IMPLIED + content CDATA #REQUIRED + scheme CDATA #IMPLIED + > + +<!-- + Relationship values can be used in principle: + + a) for document specific toolbars/menus when used + with the link element in document head e.g. + start, contents, previous, next, index, end, help + b) to link to a separate style sheet (rel="stylesheet") + c) to make a link to a script (rel="script") + d) by stylesheets to control how collections of + html nodes are rendered into printed documents + e) to make a link to a printable version of this document + e.g. a PostScript or PDF version (rel="alternate" media="print") +--> + +<!ELEMENT link EMPTY> +<!ATTLIST link + %attrs; + charset %Charset; #IMPLIED + href %URI; #IMPLIED + hreflang %LanguageCode; #IMPLIED + type %ContentType; #IMPLIED + rel %LinkTypes; #IMPLIED + rev %LinkTypes; #IMPLIED + media %MediaDesc; #IMPLIED + > + +<!-- style info, which may include CDATA sections --> +<!ELEMENT style (#PCDATA)> +<!ATTLIST style + %i18n; + id ID #IMPLIED + type %ContentType; #REQUIRED + media %MediaDesc; #IMPLIED + title %Text; #IMPLIED + xml:space (preserve) #FIXED 'preserve' + > + +<!-- script statements, which may include CDATA sections --> +<!ELEMENT script (#PCDATA)> +<!ATTLIST script + id ID #IMPLIED + charset %Charset; #IMPLIED + type %ContentType; #REQUIRED + src %URI; #IMPLIED + defer (defer) #IMPLIED + xml:space (preserve) #FIXED 'preserve' + > + +<!-- alternate content container for non script-based rendering --> + +<!ELEMENT noscript %Block;> +<!ATTLIST noscript + %attrs; + > + +<!--=================== Document Body ====================================--> + +<!ELEMENT body %Block;> +<!ATTLIST body + %attrs; + onload %Script; #IMPLIED + onunload %Script; #IMPLIED + > + +<!ELEMENT div %Flow;> <!-- generic language/style container --> +<!ATTLIST div + %attrs; + > + +<!--=================== Paragraphs =======================================--> + +<!ELEMENT p %Inline;> +<!ATTLIST p + %attrs; + > + +<!--=================== Headings =========================================--> + +<!-- + There are six levels of headings from h1 (the most important) + to h6 (the least important). +--> + +<!ELEMENT h1 %Inline;> +<!ATTLIST h1 + %attrs; + > + +<!ELEMENT h2 %Inline;> +<!ATTLIST h2 + %attrs; + > + +<!ELEMENT h3 %Inline;> +<!ATTLIST h3 + %attrs; + > + +<!ELEMENT h4 %Inline;> +<!ATTLIST h4 + %attrs; + > + +<!ELEMENT h5 %Inline;> +<!ATTLIST h5 + %attrs; + > + +<!ELEMENT h6 %Inline;> +<!ATTLIST h6 + %attrs; + > + +<!--=================== Lists ============================================--> + +<!-- Unordered list --> + +<!ELEMENT ul (li)+> +<!ATTLIST ul + %attrs; + > + +<!-- Ordered (numbered) list --> + +<!ELEMENT ol (li)+> +<!ATTLIST ol + %attrs; + > + +<!-- list item --> + +<!ELEMENT li %Flow;> +<!ATTLIST li + %attrs; + > + +<!-- definition lists - dt for term, dd for its definition --> + +<!ELEMENT dl (dt|dd)+> +<!ATTLIST dl + %attrs; + > + +<!ELEMENT dt %Inline;> +<!ATTLIST dt + %attrs; + > + +<!ELEMENT dd %Flow;> +<!ATTLIST dd + %attrs; + > + +<!--=================== Address ==========================================--> + +<!-- information on author --> + +<!ELEMENT address %Inline;> +<!ATTLIST address + %attrs; + > + +<!--=================== Horizontal Rule ==================================--> + +<!ELEMENT hr EMPTY> +<!ATTLIST hr + %attrs; + > + +<!--=================== Preformatted Text ================================--> + +<!-- content is %Inline; excluding "img|object|big|small|sub|sup" --> + +<!ELEMENT pre %pre.content;> +<!ATTLIST pre + %attrs; + xml:space (preserve) #FIXED 'preserve' + > + +<!--=================== Block-like Quotes ================================--> + +<!ELEMENT blockquote %Block;> +<!ATTLIST blockquote + %attrs; + cite %URI; #IMPLIED + > + +<!--=================== Inserted/Deleted Text ============================--> + +<!-- + ins/del are allowed in block and inline content, but its + inappropriate to include block content within an ins element + occurring in inline content. +--> +<!ELEMENT ins %Flow;> +<!ATTLIST ins + %attrs; + cite %URI; #IMPLIED + datetime %Datetime; #IMPLIED + > + +<!ELEMENT del %Flow;> +<!ATTLIST del + %attrs; + cite %URI; #IMPLIED + datetime %Datetime; #IMPLIED + > + +<!--================== The Anchor Element ================================--> + +<!-- content is %Inline; except that anchors shouldn't be nested --> + +<!ELEMENT a %a.content;> +<!ATTLIST a + %attrs; + %focus; + charset %Charset; #IMPLIED + type %ContentType; #IMPLIED + name NMTOKEN #IMPLIED + href %URI; #IMPLIED + hreflang %LanguageCode; #IMPLIED + rel %LinkTypes; #IMPLIED + rev %LinkTypes; #IMPLIED + shape %Shape; "rect" + coords %Coords; #IMPLIED + > + +<!--===================== Inline Elements ================================--> + +<!ELEMENT span %Inline;> <!-- generic language/style container --> +<!ATTLIST span + %attrs; + > + +<!ELEMENT bdo %Inline;> <!-- I18N BiDi over-ride --> +<!ATTLIST bdo + %coreattrs; + %events; + lang %LanguageCode; #IMPLIED + xml:lang %LanguageCode; #IMPLIED + dir (ltr|rtl) #REQUIRED + > + +<!ELEMENT br EMPTY> <!-- forced line break --> +<!ATTLIST br + %coreattrs; + > + +<!ELEMENT em %Inline;> <!-- emphasis --> +<!ATTLIST em %attrs;> + +<!ELEMENT strong %Inline;> <!-- strong emphasis --> +<!ATTLIST strong %attrs;> + +<!ELEMENT dfn %Inline;> <!-- definitional --> +<!ATTLIST dfn %attrs;> + +<!ELEMENT code %Inline;> <!-- program code --> +<!ATTLIST code %attrs;> + +<!ELEMENT samp %Inline;> <!-- sample --> +<!ATTLIST samp %attrs;> + +<!ELEMENT kbd %Inline;> <!-- something user would type --> +<!ATTLIST kbd %attrs;> + +<!ELEMENT var %Inline;> <!-- variable --> +<!ATTLIST var %attrs;> + +<!ELEMENT cite %Inline;> <!-- citation --> +<!ATTLIST cite %attrs;> + +<!ELEMENT abbr %Inline;> <!-- abbreviation --> +<!ATTLIST abbr %attrs;> + +<!ELEMENT acronym %Inline;> <!-- acronym --> +<!ATTLIST acronym %attrs;> + +<!ELEMENT q %Inline;> <!-- inlined quote --> +<!ATTLIST q + %attrs; + cite %URI; #IMPLIED + > + +<!ELEMENT sub %Inline;> <!-- subscript --> +<!ATTLIST sub %attrs;> + +<!ELEMENT sup %Inline;> <!-- superscript --> +<!ATTLIST sup %attrs;> + +<!ELEMENT tt %Inline;> <!-- fixed pitch font --> +<!ATTLIST tt %attrs;> + +<!ELEMENT i %Inline;> <!-- italic font --> +<!ATTLIST i %attrs;> + +<!ELEMENT b %Inline;> <!-- bold font --> +<!ATTLIST b %attrs;> + +<!ELEMENT big %Inline;> <!-- bigger font --> +<!ATTLIST big %attrs;> + +<!ELEMENT small %Inline;> <!-- smaller font --> +<!ATTLIST small %attrs;> + +<!--==================== Object ======================================--> +<!-- + object is used to embed objects as part of HTML pages. + param elements should precede other content. Parameters + can also be expressed as attribute/value pairs on the + object element itself when brevity is desired. +--> + +<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*> +<!ATTLIST object + %attrs; + declare (declare) #IMPLIED + classid %URI; #IMPLIED + codebase %URI; #IMPLIED + data %URI; #IMPLIED + type %ContentType; #IMPLIED + codetype %ContentType; #IMPLIED + archive %UriList; #IMPLIED + standby %Text; #IMPLIED + height %Length; #IMPLIED + width %Length; #IMPLIED + usemap %URI; #IMPLIED + name NMTOKEN #IMPLIED + tabindex %Number; #IMPLIED + > + +<!-- + param is used to supply a named property value. + In XML it would seem natural to follow RDF and support an + abbreviated syntax where the param elements are replaced + by attribute value pairs on the object start tag. +--> +<!ELEMENT param EMPTY> +<!ATTLIST param + id ID #IMPLIED + name CDATA #IMPLIED + value CDATA #IMPLIED + valuetype (data|ref|object) "data" + type %ContentType; #IMPLIED + > + +<!--=================== Images ===========================================--> + +<!-- + To avoid accessibility problems for people who aren't + able to see the image, you should provide a text + description using the alt and longdesc attributes. + In addition, avoid the use of server-side image maps. + Note that in this DTD there is no name attribute. That + is only available in the transitional and frameset DTD. +--> + +<!ELEMENT img EMPTY> +<!ATTLIST img + %attrs; + src %URI; #REQUIRED + alt %Text; #REQUIRED + longdesc %URI; #IMPLIED + height %Length; #IMPLIED + width %Length; #IMPLIED + usemap %URI; #IMPLIED + ismap (ismap) #IMPLIED + > + +<!-- usemap points to a map element which may be in this document + or an external document, although the latter is not widely supported --> + +<!--================== Client-side image maps ============================--> + +<!-- These can be placed in the same document or grouped in a + separate document although this isn't yet widely supported --> + +<!ELEMENT map ((%block; | form | %misc;)+ | area+)> +<!ATTLIST map + %i18n; + %events; + id ID #REQUIRED + class CDATA #IMPLIED + style %StyleSheet; #IMPLIED + title %Text; #IMPLIED + name NMTOKEN #IMPLIED + > + +<!ELEMENT area EMPTY> +<!ATTLIST area + %attrs; + %focus; + shape %Shape; "rect" + coords %Coords; #IMPLIED + href %URI; #IMPLIED + nohref (nohref) #IMPLIED + alt %Text; #REQUIRED + > + +<!--================ Forms ===============================================--> +<!ELEMENT form %form.content;> <!-- forms shouldn't be nested --> + +<!ATTLIST form + %attrs; + action %URI; #REQUIRED + method (get|post) "get" + enctype %ContentType; "application/x-www-form-urlencoded" + onsubmit %Script; #IMPLIED + onreset %Script; #IMPLIED + accept %ContentTypes; #IMPLIED + accept-charset %Charsets; #IMPLIED + > + +<!-- + Each label must not contain more than ONE field + Label elements shouldn't be nested. +--> +<!ELEMENT label %Inline;> +<!ATTLIST label + %attrs; + for IDREF #IMPLIED + accesskey %Character; #IMPLIED + onfocus %Script; #IMPLIED + onblur %Script; #IMPLIED + > + +<!ENTITY % InputType + "(text | password | checkbox | + radio | submit | reset | + file | hidden | image | button)" + > + +<!-- the name attribute is required for all but submit & reset --> + +<!ELEMENT input EMPTY> <!-- form control --> +<!ATTLIST input + %attrs; + %focus; + type %InputType; "text" + name CDATA #IMPLIED + value CDATA #IMPLIED + checked (checked) #IMPLIED + disabled (disabled) #IMPLIED + readonly (readonly) #IMPLIED + size CDATA #IMPLIED + maxlength %Number; #IMPLIED + src %URI; #IMPLIED + alt CDATA #IMPLIED + usemap %URI; #IMPLIED + onselect %Script; #IMPLIED + onchange %Script; #IMPLIED + accept %ContentTypes; #IMPLIED + > + +<!ELEMENT select (optgroup|option)+> <!-- option selector --> +<!ATTLIST select + %attrs; + name CDATA #IMPLIED + size %Number; #IMPLIED + multiple (multiple) #IMPLIED + disabled (disabled) #IMPLIED + tabindex %Number; #IMPLIED + onfocus %Script; #IMPLIED + onblur %Script; #IMPLIED + onchange %Script; #IMPLIED + > + +<!ELEMENT optgroup (option)+> <!-- option group --> +<!ATTLIST optgroup + %attrs; + disabled (disabled) #IMPLIED + label %Text; #REQUIRED + > + +<!ELEMENT option (#PCDATA)> <!-- selectable choice --> +<!ATTLIST option + %attrs; + selected (selected) #IMPLIED + disabled (disabled) #IMPLIED + label %Text; #IMPLIED + value CDATA #IMPLIED + > + +<!ELEMENT textarea (#PCDATA)> <!-- multi-line text field --> +<!ATTLIST textarea + %attrs; + %focus; + name CDATA #IMPLIED + rows %Number; #REQUIRED + cols %Number; #REQUIRED + disabled (disabled) #IMPLIED + readonly (readonly) #IMPLIED + onselect %Script; #IMPLIED + onchange %Script; #IMPLIED + > + +<!-- + The fieldset element is used to group form fields. + Only one legend element should occur in the content + and if present should only be preceded by whitespace. +--> +<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*> +<!ATTLIST fieldset + %attrs; + > + +<!ELEMENT legend %Inline;> <!-- fieldset label --> +<!ATTLIST legend + %attrs; + accesskey %Character; #IMPLIED + > + +<!-- + Content is %Flow; excluding a, form and form controls +--> +<!ELEMENT button %button.content;> <!-- push button --> +<!ATTLIST button + %attrs; + %focus; + name CDATA #IMPLIED + value CDATA #IMPLIED + type (button|submit|reset) "submit" + disabled (disabled) #IMPLIED + > + +<!--======================= Tables =======================================--> + +<!-- Derived from IETF HTML table standard, see [RFC1942] --> + +<!-- + The border attribute sets the thickness of the frame around the + table. The default units are screen pixels. + + The frame attribute specifies which parts of the frame around + the table should be rendered. The values are not the same as + CALS to avoid a name clash with the valign attribute. +--> +<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)"> + +<!-- + The rules attribute defines which rules to draw between cells: + + If rules is absent then assume: + "none" if border is absent or border="0" otherwise "all" +--> + +<!ENTITY % TRules "(none | groups | rows | cols | all)"> + +<!-- horizontal alignment attributes for cell contents + + char alignment char, e.g. char=':' + charoff offset for alignment char +--> +<!ENTITY % cellhalign + "align (left|center|right|justify|char) #IMPLIED + char %Character; #IMPLIED + charoff %Length; #IMPLIED" + > + +<!-- vertical alignment attributes for cell contents --> +<!ENTITY % cellvalign + "valign (top|middle|bottom|baseline) #IMPLIED" + > + +<!ELEMENT table + (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))> +<!ELEMENT caption %Inline;> +<!ELEMENT thead (tr)+> +<!ELEMENT tfoot (tr)+> +<!ELEMENT tbody (tr)+> +<!ELEMENT colgroup (col)*> +<!ELEMENT col EMPTY> +<!ELEMENT tr (th|td)+> +<!ELEMENT th %Flow;> +<!ELEMENT td %Flow;> + +<!ATTLIST table + %attrs; + summary %Text; #IMPLIED + width %Length; #IMPLIED + border %Pixels; #IMPLIED + frame %TFrame; #IMPLIED + rules %TRules; #IMPLIED + cellspacing %Length; #IMPLIED + cellpadding %Length; #IMPLIED + > + +<!ATTLIST caption + %attrs; + > + +<!-- +colgroup groups a set of col elements. It allows you to group +several semantically related columns together. +--> +<!ATTLIST colgroup + %attrs; + span %Number; "1" + width %MultiLength; #IMPLIED + %cellhalign; + %cellvalign; + > + +<!-- + col elements define the alignment properties for cells in + one or more columns. + + The width attribute specifies the width of the columns, e.g. + + width=64 width in screen pixels + width=0.5* relative width of 0.5 + + The span attribute causes the attributes of one + col element to apply to more than one column. +--> +<!ATTLIST col + %attrs; + span %Number; "1" + width %MultiLength; #IMPLIED + %cellhalign; + %cellvalign; + > + +<!-- + Use thead to duplicate headers when breaking table + across page boundaries, or for static headers when + tbody sections are rendered in scrolling panel. + + Use tfoot to duplicate footers when breaking table + across page boundaries, or for static footers when + tbody sections are rendered in scrolling panel. + + Use multiple tbody sections when rules are needed + between groups of table rows. +--> +<!ATTLIST thead + %attrs; + %cellhalign; + %cellvalign; + > + +<!ATTLIST tfoot + %attrs; + %cellhalign; + %cellvalign; + > + +<!ATTLIST tbody + %attrs; + %cellhalign; + %cellvalign; + > + +<!ATTLIST tr + %attrs; + %cellhalign; + %cellvalign; + > + + +<!-- Scope is simpler than headers attribute for common tables --> +<!ENTITY % Scope "(row|col|rowgroup|colgroup)"> + +<!-- th is for headers, td for data and for cells acting as both --> + +<!ATTLIST th + %attrs; + abbr %Text; #IMPLIED + axis CDATA #IMPLIED + headers IDREFS #IMPLIED + scope %Scope; #IMPLIED + rowspan %Number; "1" + colspan %Number; "1" + %cellhalign; + %cellvalign; + > + +<!ATTLIST td + %attrs; + abbr %Text; #IMPLIED + axis CDATA #IMPLIED + headers IDREFS #IMPLIED + scope %Scope; #IMPLIED + rowspan %Number; "1" + colspan %Number; "1" + %cellhalign; + %cellvalign; + > + Property changes on: trunk/foray/doc/dtd/xhtml1-strict.dtd ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Modified: trunk/foray/doc/web/app/features/fonts.html =================================================================== --- trunk/foray/doc/web/app/features/fonts.html 2006-04-30 00:29:26 UTC (rev 7100) +++ trunk/foray/doc/web/app/features/fonts.html 2006-04-30 18:01:54 UTC (rev 7101) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -153,7 +154,7 @@ free-standing fonts and to assist in resolving which font to select when processing XSL-FO input. This font-configuration can be thought of as the user's description of the -“database\xE2\x80? of font information that is available to FOray. +“database�? of font information that is available to FOray. FOray uses the <a rel="external" href="http://www.axsl.org/font/configure.html">aXSL font-configuration DTD</a> for this purpose.</p> @@ -205,7 +206,7 @@ files (AFM) for Adobe fonts</a> are available from their ftp site.</li> <li><a href="http://www.zaban.net/paktype/">Pak Type</a> (Pakistani Typography) is “a c... [truncated message content] |
|
From: <vic...@us...> - 2006-04-30 00:29:35
|
Revision: 7100 Author: victormote Date: 2006-04-29 17:29:26 -0700 (Sat, 29 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7100&view=rev Log Message: ----------- Fix no-longer-valid dependency. Modified Paths: -------------- trunk/foray/foray-graphic/.classpath Modified: trunk/foray/foray-graphic/.classpath =================================================================== --- trunk/foray/foray-graphic/.classpath 2006-04-29 23:54:08 UTC (rev 7099) +++ trunk/foray/foray-graphic/.classpath 2006-04-30 00:29:26 UTC (rev 7100) @@ -6,7 +6,6 @@ <classpathentry kind="src" path="/FOrayCommon"/> <classpathentry kind="src" path="/axslGraphic"/> <classpathentry kind="src" path="/axslCommon"/> - <classpathentry kind="var" path="AXSL_LIB_ROOT/svg-1_1.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> <classpathentry kind="var" path="JAI_HOME/lib/jai_codec.jar"/> <classpathentry kind="var" path="JAI_HOME/lib/jai_core.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-29 23:54:14
|
Revision: 7099 Author: victormote Date: 2006-04-29 16:54:08 -0700 (Sat, 29 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7099&view=rev Log Message: ----------- Bring font doc up-to-date. Modified Paths: -------------- trunk/foray/doc/web/module/font/index.html Modified: trunk/foray/doc/web/module/font/index.html =================================================================== --- trunk/foray/doc/web/module/font/index.html 2006-04-29 18:41:55 UTC (rev 7098) +++ trunk/foray/doc/web/module/font/index.html 2006-04-29 23:54:08 UTC (rev 7099) @@ -18,6 +18,7 @@ <h2>Contents</h2> <ul> <li><a href="#intro">Introduction</a></li> + <li><a href="#boot">Bootstrapping FOrayFont</a></li> <li><a href="#system-fonts">Troubleshooting System Fonts</a></li> </ul> @@ -33,26 +34,48 @@ This allows your application to use any aXSL-compliant font system without making substantial changes to your code.</p> -<p>The one implementation-specific task that is required in order to use -FOrayFont is the creation and configuration of at least one instance of -FOrayFontServer, which is FOray's implementation of the axsl FontServer -interface. -Instantiation requires only a logger. -There are three methods related to configuration:</p> +<h2><a name="boot">Bootstrapping FOrayFont</a></h2> +<p>The FOray-specific tasks that are needed to bootstrap the use of FOrayFont +are as follows:</p> +<ol> + <li>Obtain a FOrayFontServer instance. +FOrayFontServer is an aXSL FontServer implementation, and can be instantiated +using its constructor. +It is safe to create multiple instances, but this should be necessary only in +extremely sophisticated environments. +Since parsing or intuiting font configuration information from the system +can be a resource-intensive task, client applications may wish to reuse +the FontServer for multiple documents. +This is quite safe since each document has its own FontConsumer instance +which tracks the needs and results for that document.</li> + <li>Obtain a FOrayFontConsumer instance for each document to be processed. +FOrayFontConsumer is an aXSL FontConsumer implementation, and can be +instantiated using its constructor.</li> +</ol> -<ul> - <li>void setBaseURL(URL url) provides an opportunity to set a global URL - against which resources can be sought.</li> - <li>void setBaseFontURL(URL url) is similar to setBaseURL, except that - setBaseFontURL is consulted before setBaseURL when looking for - font-related files.</li> - <li>void setup(URL fontConfigFile, Map fontConfigOptions) tells the - server where to find the aXSL-compliant font-configuration-file, and - provides a Map of options. - FOrayFont does not currently use this Map for anything, but it is intended - for future use.</li> -</ul> +<p>Once these tasks are accomplished, all downstream processing is documented +in the aXSL API. +In general, this consists of using the FontConsumer for font selection, which +returns a FontUse instance. +The FontUse is then used to obtain font metrics, encoding, embedding, etc.</p> +<p>Here is some sample bootstrap code:</p> +<pre>// Instantiate the server +Log logger = org.foray.common.Logging.makeDefaultLogger(); +FOrayFontServer server = new FOrayFontServer(logger); + +// Set the base URL for physical font files. +java.net.URL baseFontURL = someURL; +server.setBaseFontURL(baseFontURL); + +// Set a resolver to be used when parsing the font-configuration +org.xml.sax.EntityResolver resolver = someResolver; +server.setEntityResolver(resolver); + +// Set up default fonts and read the font-configuration. +java.net.URL fontConfigURL = anotherURL; +server.setup(fontConfigURL, null);</pre> + <h2><a name="system-fonts">Troubleshooting System Fonts</a></h2> <p>If your application is not getting the SystemFont returned that you think it should, check the following:</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-29 18:42:21
|
Revision: 7098 Author: victormote Date: 2006-04-29 11:41:55 -0700 (Sat, 29 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7098&view=rev Log Message: ----------- Conform to aXSL changes regarding Logging. Specifically, aXSL no longer knows about logging, so Loggers must be obtained from other sources. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-04-29 18:27:13 UTC (rev 7097) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-04-29 18:41:55 UTC (rev 7098) @@ -158,9 +158,9 @@ String formattedPageNumber = pageSeq.formatPageNumber(newPageNumber); newPage.setFormattedNumber(formattedPageNumber); if (!isBlank) { - pageSeq.getLogger().info("[" + newPageNumber + "]"); + getLogger().info("[" + newPageNumber + "]"); } else { - pageSeq.getLogger().info("[" + newPageNumber + "] (blank)"); + getLogger().info("[" + newPageNumber + "] (blank)"); } currentPageNumber++; incrementPageCount(); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-04-29 18:27:13 UTC (rev 7097) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2006-04-29 18:41:55 UTC (rev 7098) @@ -255,9 +255,6 @@ return getFObjParent().getFOTreeBuilder(); } - /** - * {@inheritDoc} - */ public Log getLogger() { return getFObjParent().getLogger(); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-04-29 18:27:13 UTC (rev 7097) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java 2006-04-29 18:41:55 UTC (rev 7098) @@ -78,7 +78,7 @@ } } if (fbody == null) { - node.getLogger().error("no footnote-body in footnote"); + layout.getLogger().error("no footnote-body in footnote"); } if (area instanceof NormalBlockArea) {} return Status.OK; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-04-29 18:27:13 UTC (rev 7097) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListBlockPL.java 2006-04-29 18:41:55 UTC (rev 7098) @@ -59,7 +59,7 @@ int numChildren = node.childrenFO().size(); for (int i = listBlockPL.getProgress(); i < numChildren; i++) { if (!(node.childrenFO().get(i) instanceof ListItem)) { - node.getLogger().error("children of list-blocks must be " + layout.getLogger().error("children of list-blocks must be " + "list-items"); return Status.OK; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2006-04-29 18:27:13 UTC (rev 7097) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java 2006-04-29 18:41:55 UTC (rev 7098) @@ -46,7 +46,7 @@ if (Status.isIncomplete((status))) { /* in fact all should be laid out and clip, error etc depending * on 'overflow' */ - node.getLogger().warn("Some static content could not fit in " + layout.getLogger().warn("Some static content could not fit in " + "the area."); setProgress(i); if ((i != 0) && (status == Status.AREA_FULL_NONE)) { Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-29 18:27:13 UTC (rev 7097) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-29 18:41:55 UTC (rev 7098) @@ -70,7 +70,7 @@ if (getProgress() == FONodePL.START) { if (node.traitTableLayout() == Constants.FOVAL_AUTO) { - node.getLogger().warn("table-layout=auto is not supported, " + layout.getLogger().warn("table-layout=auto is not supported, " + "using fixed!"); } if (area instanceof NormalBlockArea) { @@ -100,7 +100,7 @@ layoutColumns(areaContainer); if (node.numberOfColumns() == 0) { - node.getLogger().warn("current implementation of tables " + layout.getLogger().warn("current implementation of tables " + "requires a table-column for each column, " + "indicating column-width"); } @@ -221,7 +221,7 @@ // from the last table body and place it on the // next page so that it can have a footer at // the end of the table. - node.getLogger().warn("footer could not fit on page, moving " + layout.getLogger().warn("footer could not fit on page, moving " + "last body row to next page"); area.incrementProgressionDimension(areaContainer.crBPD()); TableFooterPL tableFooterPL Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-04-29 18:27:13 UTC (rev 7097) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-04-29 18:41:55 UTC (rev 7098) @@ -88,7 +88,7 @@ cellColNum = colNum; } else if (cellColNum > columns.size()) { // Explicit colomn number specification out of range, skip it. - getReal().getLogger().error(" " + cell.getSystemId() + ':' + layout.getLogger().error(" " + cell.getSystemId() + ':' + cell.getLine() + ':' + cell.getColumn() + ": Cell (#" + i + ") explicitely positioned beyond number of columns, " @@ -98,7 +98,7 @@ // see if it fits and doesn't overwrite anything if (cellColNum + numCols - 1 > columns.size()) { // Too many columns spanned. - getReal().getLogger().error(" " + cell.getSystemId() + ':' + layout.getLogger().error(" " + cell.getSystemId() + ':' + cell.getLine() + ':' + cell.getColumn() + ": Cell (#" + i + ") spans columns beyond available number, clipped"); @@ -106,7 +106,7 @@ } // Check for overwriting other cells (returns false) if (cellArray.storeCell(cell, cellColNum, numCols) == false) { - getReal().getLogger().error(" " + cell.getSystemId() + ':' + layout.getLogger().error(" " + cell.getSystemId() + ':' + cell.getLine() + ':' + cell.getColumn() + ": Cell +(#" + i + ") overwrites other cells"); @@ -117,7 +117,7 @@ } else if (cellColNum < colNum) { // Cells out of order colNum = cellColNum; // CR "to the letter"! - getReal().getLogger().debug(" " + getReal().getSystemId() + ':' + layout.getLogger().debug(" " + getReal().getSystemId() + ':' + getReal().getLine() + ':' + getReal().getColumn() + ": Cell positioned out of order"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-29 18:27:27
|
Revision: 7097 Author: victormote Date: 2006-04-29 11:27:13 -0700 (Sat, 29 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7097&view=rev Log Message: ----------- Clean up tree hierarchy a bit. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-04-29 18:17:39 UTC (rev 7096) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-04-29 18:27:13 UTC (rev 7097) @@ -181,8 +181,7 @@ attlist); fobj = namespace.parseElement(localName, currentFObj, list, locator, this); - namespace.parseAttributes(list, attlist, fobj, locator, - getFOTreeControl()); + namespace.parseAttributes(list, attlist, fobj, locator, this); /* * Give the fobj a chance to do some validation and/or setup before * the children are processed. Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2006-04-29 18:17:39 UTC (rev 7096) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2006-04-29 18:27:13 UTC (rev 7097) @@ -27,8 +27,6 @@ import org.axsl.fotree.FOTreeControl; import org.axsl.fotree.FOTreeException; -import org.apache.commons.logging.Log; - import org.xml.sax.Attributes; import org.xml.sax.Locator; @@ -133,7 +131,7 @@ public abstract void parseAttributes(PropertyList list, Attributes attlist, FObj currentFObj, Locator locator, - FOTreeControl control) throws PropertyException; + FOTreeBuilder builder) throws PropertyException; /** * Reads through the list of attributes and returns an array that contains @@ -185,13 +183,12 @@ public Property parseAttribute(Attributes attributes, String attributeName, String attributeValue, - PropertyList propertyList, Locator locator, FOTreeControl control) + PropertyList propertyList, Locator locator, FOTreeBuilder builder) throws PropertyException { Property property = parseAttributeForNS(attributes, attributeName, attributeValue, propertyList, locator); if (property != null) { - checkSupportedAttribute(control.unsupportedPropertiesFO(), - control.getLogger(), attributeName, locator); + checkSupportedAttribute(builder, attributeName, locator); } return property; } @@ -203,7 +200,7 @@ protected void makeList(PropertyList propertyList, Attributes attributes, FObj parentFO, int[] attributeSort, - Locator locator, FOTreeControl control) throws PropertyException { + Locator locator, FOTreeBuilder builder) throws PropertyException { for (int j = 0; j < attributeSort.length; j++) { /* @@ -216,7 +213,7 @@ Property property = null; property = parseAttribute(attributes, attributeName, - attributeValue, propertyList, locator, control); + attributeValue, propertyList, locator, builder); if (property != null) { propertyList.addProperty(property); } @@ -272,15 +269,17 @@ } } - public void checkSupportedAttribute(short[] unsupportedProperties, - Log logger, String attributeName, Locator locator) { + public void checkSupportedAttribute(FOTreeBuilder builder, + String attributeName, Locator locator) { + FOTreeControl control = builder.getFOTreeControl(); + short[] unsupportedProperties = control.unsupportedPropertiesFO(); if (unsupportedProperties == null) { return; } short enumerated = enumerateAttribute(attributeName); for (int i = 0; i < unsupportedProperties.length; i++) { if (enumerated == unsupportedProperties[i]) { - logger.info("Unsupported attribute: " + builder.getLogger().info("Unsupported attribute: " + attributeName + " at " + formatLocator(locator) + "."); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java 2006-04-29 18:17:39 UTC (rev 7096) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java 2006-04-29 18:27:13 UTC (rev 7097) @@ -24,6 +24,7 @@ package org.foray.fotree.fo; +import org.foray.fotree.FOTreeBuilder; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.Property; @@ -32,7 +33,6 @@ import org.foray.fotree.xml.PropertyMakerXML; import org.axsl.common.Constants; -import org.axsl.fotree.FOTreeControl; import org.axsl.fotree.FOTreeException; import org.xml.sax.Attributes; @@ -61,11 +61,11 @@ } public void parseAttributes(PropertyList propertyList, Attributes attlist, - FObj currentFObj, Locator locator, FOTreeControl control) + FObj currentFObj, Locator locator, FOTreeBuilder builder) throws PropertyException { int[] attributeSort = sortAttributes(attlist); makeList(propertyList, attlist, currentFObj, attributeSort, locator, - control); + builder); } public Property parseAttributeForNS(Attributes attributes, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java 2006-04-29 18:17:39 UTC (rev 7096) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java 2006-04-29 18:27:13 UTC (rev 7097) @@ -24,6 +24,7 @@ package org.foray.fotree.foray; +import org.foray.fotree.FOTreeBuilder; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.Property; @@ -31,7 +32,6 @@ import org.foray.fotree.PropertyList; import org.foray.fotree.fo.PropertyMakerFO; -import org.axsl.fotree.FOTreeControl; import org.axsl.fotree.FOTreeException; import org.xml.sax.Attributes; @@ -61,11 +61,11 @@ } public void parseAttributes(PropertyList propertyList, Attributes attlist, - FObj currentFObj, Locator locator, FOTreeControl control) + FObj currentFObj, Locator locator, FOTreeBuilder builder) throws PropertyException { int[] attributeSort = sortAttributes(attlist); makeList(propertyList, attlist, currentFObj, attributeSort, - locator, control); + locator, builder); } public Property parseAttributeForNS(Attributes attributes, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java 2006-04-29 18:17:39 UTC (rev 7096) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java 2006-04-29 18:27:13 UTC (rev 7097) @@ -24,6 +24,7 @@ package org.foray.fotree.svg; +import org.foray.fotree.FOTreeBuilder; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.Property; @@ -31,7 +32,6 @@ import org.foray.fotree.PropertyList; import org.foray.fotree.PropertyListUnparsed; -import org.axsl.fotree.FOTreeControl; import org.axsl.fotree.FOTreeException; import org.apache.batik.util.XMLResourceDescriptor; @@ -69,7 +69,7 @@ } public void parseAttributes(PropertyList propertyList, Attributes attlist, - FObj currentFObj, Locator locator, FOTreeControl control) + FObj currentFObj, Locator locator, FOTreeBuilder builder) throws PropertyException { /* * There is nothing to do here. We passed the raw attributes when Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java 2006-04-29 18:17:39 UTC (rev 7096) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java 2006-04-29 18:27:13 UTC (rev 7097) @@ -24,13 +24,13 @@ package org.foray.fotree.xml; +import org.foray.fotree.FOTreeBuilder; import org.foray.fotree.FObj; import org.foray.fotree.Namespace; import org.foray.fotree.Property; import org.foray.fotree.PropertyException; import org.foray.fotree.PropertyList; -import org.axsl.fotree.FOTreeControl; import org.axsl.fotree.FOTreeException; import org.xml.sax.Attributes; @@ -60,7 +60,7 @@ } public void parseAttributes(PropertyList propertyList, Attributes attlist, - FObj currentFObj, Locator locator, FOTreeControl control) + FObj currentFObj, Locator locator, FOTreeBuilder builder) throws PropertyException { // This isn't needed for the xml: namespace. return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-29 18:17:45
|
Revision: 7096 Author: victormote Date: 2006-04-29 11:17:39 -0700 (Sat, 29 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7096&view=rev Log Message: ----------- Clean up tree hierarchy a bit. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-04-29 17:52:03 UTC (rev 7095) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-04-29 18:17:39 UTC (rev 7096) @@ -180,7 +180,7 @@ PropertyList list = namespace.createNewPropertyList(localName, attlist); fobj = namespace.parseElement(localName, currentFObj, list, - locator, getFOTreeControl(), getLogger()); + locator, this); namespace.parseAttributes(list, attlist, fobj, locator, getFOTreeControl()); /* Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2006-04-29 17:52:03 UTC (rev 7095) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2006-04-29 18:17:39 UTC (rev 7096) @@ -66,14 +66,13 @@ public FObj parseElement(String localName, FObj currentFObj, PropertyList list, Locator locator, - FOTreeControl control, Log logger) throws FOTreeException { + FOTreeBuilder builder) throws FOTreeException { FObj fobj = parseElementForNS(localName, currentFObj, list, locator); if (fobj == null) { - checkUnknownElement(localName, locator, logger); + checkUnknownElement(builder, localName, locator); } else { - checkSupportedElement(control.unsupportedObjectsFO(), - control.getLogger(), localName, locator); + checkSupportedElement(builder, localName, locator); } return fobj; } @@ -88,10 +87,9 @@ * @param localName The local name of the element to be checked and logged. * @param locator The Locator instance indicating the source of the foreign * element. - * @param logger The logger to which the error should be logged. */ - private void checkUnknownElement(String localName, Locator locator, - Log logger) { + private void checkUnknownElement(FOTreeBuilder builder, String localName, + Locator locator) { if (this.unknownFOs.containsKey(localName)) { return; } @@ -108,7 +106,7 @@ sb.append("unavailable"); } if (this.errorCount == 0) { - logger.error(sb.toString()); + builder.getLogger().error(sb.toString()); } this.errorCount++; } @@ -257,15 +255,17 @@ */ public abstract String getPropertyName(short propertyType) ; - public void checkSupportedElement(byte[] unsupportedObjects, - Log logger, String localName, Locator locator) { + public void checkSupportedElement(FOTreeBuilder builder, + String localName, Locator locator) { + FOTreeControl control = builder.getFOTreeControl(); + byte[] unsupportedObjects = control.unsupportedObjectsFO(); if (unsupportedObjects == null) { return; } byte enumerated = enumerateElement(localName); for (int i = 0; i < unsupportedObjects.length; i++) { if (enumerated == unsupportedObjects[i]) { - logger.info("Unsupported element: " + builder.getLogger().info("Unsupported element: " + getTypicalPrefix() + ":" + localName + " at " + formatLocator(locator) + "."); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-29 17:52:23
|
Revision: 7095 Author: victormote Date: 2006-04-29 10:52:03 -0700 (Sat, 29 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7095&view=rev Log Message: ----------- Let each FOTreeBuilder have its own logger. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-04-28 21:48:43 UTC (rev 7094) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-04-29 17:52:03 UTC (rev 7095) @@ -235,7 +235,7 @@ if (this.foTreeServer != null) { return; } - this.foTreeServer = new FOrayFOTreeServer(); + this.foTreeServer = new FOrayFOTreeServer(this.getLogger()); } public GraphicServer getGraphicServer() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-04-28 21:48:43 UTC (rev 7094) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2006-04-29 17:52:03 UTC (rev 7095) @@ -82,9 +82,13 @@ private FOrayFOTreeServer server; - public FOTreeBuilder(FOrayFOTreeServer server, FOTreeControl treeControl) { + private Log logger; + + public FOTreeBuilder(FOrayFOTreeServer server, FOTreeControl treeControl, + Log logger) { this.server = server; this.treeControl = treeControl; + this.logger = logger; } /** @@ -233,7 +237,7 @@ } public Log getLogger() { - return getFOTreeControl().getLogger(); + return this.logger; } private int getLine() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java 2006-04-28 21:48:43 UTC (rev 7094) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOrayFOTreeServer.java 2006-04-29 17:52:03 UTC (rev 7095) @@ -34,6 +34,8 @@ import org.axsl.fotree.FOTreeControl; import org.axsl.fotree.FOTreeServer; +import org.apache.commons.logging.Log; + import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; @@ -45,6 +47,8 @@ */ public class FOrayFOTreeServer implements FOTreeServer { + Log logger; + /** * Map whose key is a String of the namespace URI, and whose value is * a Namespace instance that knows how to parse items in that namespace. @@ -56,7 +60,8 @@ private NamespaceSVG namespaceSVG; private NamespaceXML namespaceXML; - public FOrayFOTreeServer() { + public FOrayFOTreeServer(Log logger) { + this.logger = logger; setupNamespaces(); } @@ -184,7 +189,11 @@ */ public org.axsl.fotree.FOTreeBuilder makeTreeBuilder( FOTreeControl control) { - return new FOTreeBuilder(this, control); + return new FOTreeBuilder(this, control, this.getLogger()); } + public Log getLogger() { + return this.logger; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-28 21:48:53
|
Revision: 7094 Author: victormote Date: 2006-04-28 14:48:43 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7094&view=rev Log Message: ----------- Add and use new FontSelectorFactory concept to allow custom FontSelectors to be used in the system. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java Added Paths: ----------- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-28 21:07:14 UTC (rev 7093) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-28 21:48:43 UTC (rev 7094) @@ -123,6 +123,8 @@ */ private HashMap registeredFonts = new HashMap(); + private HashMap registeredFontSelectorFactories = new HashMap(); + /** * Constructor. * @param logger The Logger to be used for system-level messages. Please @@ -811,10 +813,35 @@ } public FontSelector makeFontSelector(FOrayFontConsumer consumer) { - if (consumer.getFontSelectorAutoType().equals("default")) { + String selectorName = consumer.getFontSelectorAutoType(); + FontSelectorFactory factory = (FontSelectorFactory) + this.registeredFontSelectorFactories.get(selectorName); + if (factory != null) { + return factory.makeFontSelector(consumer); + } + if (selectorName.equals("default")) { return consumer.getFontSelectorCBC(); } return null; } + /** + * Register a FontSelectorFactory for use in the font system. + * @param name The name by which this factory should be referred in + * {@link FOrayFontConsumer#setFontSelectorAutoType(String)}. + * @param factory The factory instance that should be used to create + * FontSelectors for <code>name</code> when requested. + * @throws FontException If either <code>name</code>, or + * <code>factory</code> is invalid. + */ + public void registerFontSelectorFactory(String name, + FontSelectorFactory factory) throws FontException { + if (name == null + || factory == null) { + throw new FontException("Unable to register null or unnamed " + + "FontSelectorFactory."); + } + this.registeredFontSelectorFactories.put(name, factory); + } + } Added: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java (rev 0) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java 2006-04-28 21:48:43 UTC (rev 7094) @@ -0,0 +1,39 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * 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. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.font; + +/** + * Interface for classes that know how to create FontSelector implementations. + */ +public interface FontSelectorFactory { + + /** + * Create an instance of the appropriate FontSelector. + * @param consumer The FontConsumer that owns the new FontSelector. + * @return The newly-created FontSelector instance. + */ + public abstract FontSelector makeFontSelector(FOrayFontConsumer consumer); + +} Property changes on: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-28 21:07:21
|
Revision: 7093 Author: victormote Date: 2006-04-28 14:07:14 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7093&view=rev Log Message: ----------- Add logic to (theoretically) choose between the "cbc" and "auto" font-selection-strategy options. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-04-28 20:29:59 UTC (rev 7092) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-04-28 21:07:14 UTC (rev 7093) @@ -97,8 +97,16 @@ private byte encodingLatitude = ENCODING_ANY; - private FontSelector fontSelector; + /** The FontSelection instance to be used for font-selection-strategy = + * "character-by-character". */ + private FontSelector fontSelectorCBC; + /** The FontSelection instance to be used for font-selection-strategy = + * "auto". */ + private FontSelector fontSelectorAuto; + + private String fontSelectorAutoType = "default"; + /** * Constructor. * @param server The FOrayFontServer instance serving this FontConsumer. @@ -159,13 +167,45 @@ return this.server; } - private FontSelector getFontSelector() { - if (this.fontSelector == null) { - this.fontSelector = new FontSelectorCBC(this); + private FontSelector getFontSelector(int strategy) { + switch (strategy) { + case Font.FONT_SELECTION_CBC: { + return this.getFontSelectorCBC(); } - return this.fontSelector; + case Font.FONT_SELECTION_AUTO: { + return this.getFontSelectorAuto(); + } + } + /* This indicates invalid input. */ + return this.getFontSelectorCBC(); } + public String getFontSelectorAutoType() { + return this.fontSelectorAutoType; + } + + public void setFontSelectorAutoType(String newFontSelectorAutoType) { + if (this.fontSelectorAuto == null) { + /* Fails silently if the "auto" FontSelector has already been + * created. */ + this.fontSelectorAutoType = newFontSelectorAutoType; + } + } + + public FontSelector getFontSelectorCBC() { + if (this.fontSelectorCBC == null) { + this.fontSelectorCBC = new FontSelectorCBC(this); + } + return this.fontSelectorCBC; + } + + public FontSelector getFontSelectorAuto() { + if (this.fontSelectorAuto == null) { + this.fontSelectorAuto = this.getFontServer().makeFontSelector(this); + } + return this.fontSelectorAuto; + } + /** * {@inheritDoc} */ @@ -173,7 +213,7 @@ String [] familyList, int style, int weight, int variant, int stretch, int size, int codePoint) throws FontException { - FontSelector selector = getFontSelector(); + FontSelector selector = getFontSelector(selectionStrategy); FOrayFont fontSelected = null; RegisteredFontDesc fontDescSelected = selector.selectFont(familyList, style, weight, variant, stretch, size, codePoint); Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-28 20:29:59 UTC (rev 7092) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-28 21:07:14 UTC (rev 7093) @@ -810,4 +810,11 @@ simulatedStretch); } + public FontSelector makeFontSelector(FOrayFontConsumer consumer) { + if (consumer.getFontSelectorAutoType().equals("default")) { + return consumer.getFontSelectorCBC(); + } + return null; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-28 20:30:22
|
Revision: 7092 Author: victormote Date: 2006-04-28 13:29:59 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7092&view=rev Log Message: ----------- Conform to new aXSL requirements for font selection. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFDocumentGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-04-28 19:48:55 UTC (rev 7091) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-04-28 20:29:59 UTC (rev 7092) @@ -20,6 +20,7 @@ package org.foray.font; +import org.axsl.font.Font; import org.axsl.font.FontConsumer; import org.axsl.font.FontException; import org.axsl.ps.Encoding; @@ -168,7 +169,8 @@ /** * {@inheritDoc} */ - public org.axsl.font.FontUse selectFontXSL(String [] familyList, int style, + public org.axsl.font.FontUse selectFontXSL(int selectionStrategy, + String [] familyList, int style, int weight, int variant, int stretch, int size, int codePoint) throws FontException { FontSelector selector = getFontSelector(); @@ -314,8 +316,8 @@ public org.axsl.font.FontUse selectFontCSS(String [] familyList, int style, int weight, int variant, int stretch, int size, int codePoint) throws FontException { - return selectFontXSL(familyList, style, weight, variant, stretch, size, - codePoint); + return selectFontXSL(Font.FONT_SELECTION_CBC, familyList, style, weight, + variant, stretch, size, codePoint); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-04-28 19:48:55 UTC (rev 7091) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-04-28 20:29:59 UTC (rev 7092) @@ -222,6 +222,7 @@ firstChar = firstTextSegment[0]; } this.resolvedFont = fobj.getFontConsumer().selectFontXSL( + convertFontSelectionStrategy(traitFontSelectionStrategy()), getFontFamily(), convertFontStyle(getFontStyle()), getFontWeight(), @@ -240,6 +241,7 @@ org.axsl.font.FontUse secondaryFont = null; try { secondaryFont = fobj.getFontConsumer().selectFontXSL( + convertFontSelectionStrategy(traitFontSelectionStrategy()), getFontFamily(), convertFontStyle(getFontStyle()), getFontWeight(), @@ -3203,6 +3205,19 @@ return getWritingMode().getIPAxis(); } + public static int convertFontSelectionStrategy( + int parsedFontSelectionStrategy) { + switch(parsedFontSelectionStrategy) { + case Constants.FOVAL_CHARACTER_BY_CHARACTER: { + return org.axsl.font.Font.FONT_SELECTION_CBC; + } + case Constants.FOVAL_AUTO: { + return org.axsl.font.Font.FONT_SELECTION_AUTO; + } + } + return org.axsl.font.Font.FONT_SELECTION_AUTO; + } + /** * Converts a parsed font-variant constant to a Font font-variant * constant. Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFDocumentGraphics2D.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFDocumentGraphics2D.java 2006-04-28 19:48:55 UTC (rev 7091) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFDocumentGraphics2D.java 2006-04-28 20:29:59 UTC (rev 7092) @@ -90,6 +90,7 @@ if (!textAsShapes) { try { this.font = fontConsumer.selectFontXSL( + org.axsl.font.Font.FONT_SELECTION_AUTO, new String[] {"Helvetica"}, org.axsl.font.Font.FONT_STYLE_NORMAL, org.axsl.font.Font.FONT_WEIGHT_NORMAL, Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2006-04-28 19:48:55 UTC (rev 7091) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2006-04-28 20:29:59 UTC (rev 7092) @@ -870,6 +870,7 @@ try { FontConsumer fontConsumer = this.currentFont.getFontConsumer(); return fontConsumer.selectFontXSL( + org.axsl.font.Font.FONT_SELECTION_AUTO, FontUtility.foFontFamily(fontFamily), fontStyle, fontWeight, org.axsl.font.Font.FONT_VARIANT_NORMAL, Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2006-04-28 19:48:55 UTC (rev 7091) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2006-04-28 20:29:59 UTC (rev 7092) @@ -300,6 +300,7 @@ if (font == null) { this.fontFamily = "any"; return this.nominalFont.getFontConsumer().selectFontXSL( + org.axsl.font.Font.FONT_SELECTION_AUTO, new String[] {"any"}, style, weight, 0, org.axsl.font.Font.FONT_STRETCH_NORMAL, fsize * 1000, ' '); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-28 19:49:10
|
Revision: 7091 Author: victormote Date: 2006-04-28 12:48:55 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7091&view=rev Log Message: ----------- 1. Add new abstract class FontSelector and a concrete subclass FontSelectorCBC. 2. Push the font-selection logic out of FOrayFontConsumer and into FontSelectorCBC. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java Added Paths: ----------- trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-04-28 16:42:03 UTC (rev 7090) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-04-28 19:48:55 UTC (rev 7091) @@ -96,6 +96,8 @@ private byte encodingLatitude = ENCODING_ANY; + private FontSelector fontSelector; + /** * Constructor. * @param server The FOrayFontServer instance serving this FontConsumer. @@ -156,41 +158,26 @@ return this.server; } + private FontSelector getFontSelector() { + if (this.fontSelector == null) { + this.fontSelector = new FontSelectorCBC(this); + } + return this.fontSelector; + } + /** * {@inheritDoc} */ public org.axsl.font.FontUse selectFontXSL(String [] familyList, int style, int weight, int variant, int stretch, int size, int codePoint) throws FontException { - /* The algorithm for font selection is described in the CSS 2 - * standard at Section 15.5. - * It appears that the general font selection algorithm is the same for - * CSS and for XSL-FO. - * Even though there are now versions of CSS past version 2, we still - * use CSS 2. - * CSS 2.1 removed the font-stretch property, but XSL-FO 1.1 requires - * it, so we use the 2.0 algorithm. */ + FontSelector selector = getFontSelector(); FOrayFont fontSelected = null; - RegisteredFontDesc fontDescSelected = null; - if (familyList != null) { - for (int i = 0; i < familyList.length; i++) { - String familyToUse = familyList[i]; - fontDescSelected = selectFont(familyToUse, style, weight, - variant, stretch, size); - /* Skip this font-family if it doesn't have a font that fits. */ - if (fontDescSelected == null) { - continue; - } - /* Use the SystemFont or FreeStandingFont? */ - fontSelected = whichUse(fontDescSelected, codePoint); - /* Skip this font-family if we can't use the type of font it - * supports or if it can't encode the character. */ - if (fontSelected == null) { - continue; - } - /* Otherwise, this one works. */ - break; - } + RegisteredFontDesc fontDescSelected = selector.selectFont(familyList, + style, weight, variant, stretch, size, codePoint); + if (fontDescSelected != null) { + fontSelected = whichUse(fontDescSelected, + codePoint); } if (fontSelected == null) { /* None of the requested font-family items can provide a suitable @@ -202,8 +189,7 @@ } return fontUse; } - if (fontDescSelected == null - || fontSelected == null) { + if (fontSelected == null) { return null; } FOrayConsumerFont consumerFont = registerFontUse(fontSelected); @@ -216,7 +202,7 @@ /** * Return a default font. We don't care what it can encode. */ - private FOrayFontUse getDefaultFontUse() { + protected FOrayFontUse getDefaultFontUse() { RegisteredFontDesc fontDescSelected = selectDefaultFont(); if (fontDescSelected == null) { return null; @@ -332,21 +318,6 @@ codePoint); } - private RegisteredFontDesc selectFont(String familyToTry, int style, - int weight, int variant, int stretch, int size) { - if (familyToTry == null) { - return null; - } - RegisteredFontFamily rff = null; - rff = this.server.getRegisteredFontFamily(familyToTry); - if (rff == null) { - return null; - } - return rff.findRegisteredFontDesc(style, weight, variant, stretch, - isUsingFreeStandingFonts(), - isUsingSystemFonts()); - } - /** * {@inheritDoc} */ Added: trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java (rev 0) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2006-04-28 19:48:55 UTC (rev 7091) @@ -0,0 +1,46 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * 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. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.font; + +import org.axsl.font.FontException; + +/** + * Abstract superclass for all font-selection strategies. + */ +public abstract class FontSelector { + + /** The parent FontConsumer. */ + FOrayFontConsumer consumer; + + public FontSelector(FOrayFontConsumer consumer) { + super(); + this.consumer = consumer; + } + + public abstract RegisteredFontDesc selectFont(String [] familyList, + int style, int weight, int variant, int stretch, int size, + int codePoint) throws FontException ; + +} Property changes on: trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java (rev 0) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2006-04-28 19:48:55 UTC (rev 7091) @@ -0,0 +1,94 @@ +/* + * Copyright 2006 The FOray Project. + * http://www.foray.org + * + * 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. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* $Id$ */ + +package org.foray.font; + +import org.axsl.font.FontException; + +/** + * The standard character-by-character font selector. + * XSL-FO 1.0, Section 7.8.3, described the character-by-character strategy as + * being "the same as the strategy used to select fonts in CSS." + * Therefore, the CSS documentation should be consulted. + * The algorithm for font selection is described in the CSS 2 standard at + * Section 15.5. + * Even though there are now versions of CSS past version 2, we still use CSS 2. + * CSS 2.1 removed the font-stretch property, but XSL-FO 1.1 requires it, so, + * until given more clear guidance, we use the 2.0 algorithm. + */ +public class FontSelectorCBC extends FontSelector { + + public FontSelectorCBC(FOrayFontConsumer consumer) { + super(consumer); + } + + public RegisteredFontDesc selectFont(String [] familyList, int style, + int weight, int variant, int stretch, int size, int codePoint) + throws FontException { + FOrayFont fontSelected = null; + RegisteredFontDesc fontDescSelected = null; + if (familyList != null) { + for (int i = 0; i < familyList.length; i++) { + String familyToUse = familyList[i]; + fontDescSelected = selectFont(familyToUse, style, weight, + variant, stretch, size); + /* Skip this font-family if it doesn't have a font that fits. */ + if (fontDescSelected == null) { + continue; + } + /* Use the SystemFont or FreeStandingFont? */ + fontSelected = this.consumer.whichUse(fontDescSelected, + codePoint); + /* Skip this font-family if we can't use the type of font it + * supports or if it can't encode the character. */ + if (fontSelected == null) { + continue; + } + /* Otherwise, this one works. */ + return fontDescSelected; + } + } + return null; + } + + private RegisteredFontDesc selectFont(String familyToTry, int style, + int weight, int variant, int stretch, int size) { + if (familyToTry == null) { + return null; + } + RegisteredFontFamily rff = null; + rff = getFontServer().getRegisteredFontFamily(familyToTry); + if (rff == null) { + return null; + } + return rff.findRegisteredFontDesc(style, weight, variant, stretch, + consumer.isUsingFreeStandingFonts(), + consumer.isUsingSystemFonts()); + } + + public FOrayFontServer getFontServer() { + return this.consumer.getFontServer(); + } + +} Property changes on: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-28 16:42:11
|
Revision: 7090 Author: victormote Date: 2006-04-28 09:42:03 -0700 (Fri, 28 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7090&view=rev Log Message: ----------- Move some font doc from foray to axsl. Modified Paths: -------------- trunk/foray/doc/web/module/font/index.html Modified: trunk/foray/doc/web/module/font/index.html =================================================================== --- trunk/foray/doc/web/module/font/index.html 2006-04-28 01:51:24 UTC (rev 7089) +++ trunk/foray/doc/web/module/font/index.html 2006-04-28 16:42:03 UTC (rev 7090) @@ -18,19 +18,12 @@ <h2>Contents</h2> <ul> <li><a href="#intro">Introduction</a></li> - <li><a href="#xsl-fo">XSL-FO Conformance</a> - <ul> - <li><a href="#font-selection-strategy">Notes on - font-selection-strategy</a></li> - <li><a href="#simulated-small-caps">Notes on simulated small-caps</a></li> - </ul> - </li> <li><a href="#system-fonts">Troubleshooting System Fonts</a></li> </ul> <h2><a name="intro">Introduction</a></h2> <p>FOrayFont is an implementation of the -<a href="http://www.axsl.org/font/index.html" rel="external">axslFont</a> +<a href="http://www.axsl.org/font/" rel="external">axslFont</a> interface, which should be consulted for details on the general API, sample code, etc. Although it is possible to use the FOrayFont package directly, there is @@ -60,89 +53,6 @@ for future use.</li> </ul> -<h2><a name="xsl-fo">XSL-FO Conformance</a></h2> -<p>FOrayFont is intended to provide tools that can be used to build applications -conformant to the XSL-FO standard. The following table lists items related to -this conformance:</p> -<table> - <thead> - <tr> - <td>Standard Item</td> - <td>Citations</td> - <td>Conformance</td> - </tr> - </thead> - <tr> - <td>font-family</td> - <td>7.8.2</td> - <td>yes</td> - </tr> - <tr> - <td>font-selection-strategy</td> - <td>7.8.3</td> - <td>This is really an FO Tree issue. See - <a href="#font-selection-strategy">"Notes on font-selection-strategy"</a> - below.</td> - </tr> - <tr> - <td>font-size</td> - <td>7.8.4</td> - <td>yes</td> - </tr> - <tr> - <td>font-stretch</td> - <td>7.8.5</td> - <td>yes</td> - </tr> - <tr> - <td>font-size-adjust</td> - <td>7.8.6</td> - <td>This is actually not a font system issue, but an FO Tree issue.</td> - </tr> - <tr> - <td>font-style</td> - <td>7.8.7</td> - <td>yes</td> - </tr> - <tr> - <td>font-variant</td> - <td>7.8.8</td> - <td>Yes. See also <a href="#simulated-small-caps">"Notes on simulated - small-caps" below.</a></td> - </tr> - <tr> - <td>font-weight</td> - <td>7.8.9</td> - <td>yes</td> - </tr> -</table> - -<h3><a name="font-selection-strategy">Notes on font-selection-strategy</a></h3> -<p>FOray provides support for "character-by-character", which is also -currently used when "auto" is selected. FOray can conceivably provide tools to -applications that need a smarter "auto" strategy, but does not do so now. -The standard appears to provide "auto" as an option for those with a specific -strategy in mind, and we have no such strategy in mind. -If you would like to see a specific strategy implemented, please contact us on -the user mailing list. -</p> - -<h3><a name="simulated-small-caps">Notes on simulated small-caps</a></h3> -<p>Simulated small-caps must be handled outside of the font system. -Flagging a font-description in the font-configuration file with a -simulated-font-stretch value merely does the following -1) allows that font to be selected with either normal or small-caps variant, -<em>and </em> -2) tells the font system what percentage the user wishes to use for small-caps, -if small-caps is selected. -So, for font-variant="small-caps", if a true small-caps variant for the font is -found, it will be selected. -If not, but a simulated small-caps font is available, it will be selected. -In the first case, the font system sees two different fonts with two different -sets of metrics. In the second case, it sees only one font. -The client application must handle the switching back and forth from one point -size to another to get the correct metrics information from this one font.</p> - <h2><a name="system-fonts">Troubleshooting System Fonts</a></h2> <p>If your application is not getting the SystemFont returned that you think it should, check the following:</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-28 01:51:31
|
Revision: 7089 Author: victormote Date: 2006-04-27 18:51:24 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7089&view=rev Log Message: ----------- Remove some no-longer needed code, per request from Vincent Hennebert. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-04-28 01:30:21 UTC (rev 7088) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-04-28 01:51:24 UTC (rev 7089) @@ -352,14 +352,12 @@ this.currentEncoding = attributes.getValue("encoding"); String embed = attributes.getValue("embed"); if (embed != null && !embed.equals("")) { - this.previousEmbed = this.currentEmbed; this.currentEmbed = embed; } String xmlBase = replaceParameters(attributes.getValue("xml:base")); if (xmlBase != null && !xmlBase.equals("")) { try { /* Update the current xml base. */ - this.previousXMLBase = this.currentXMLBase; this.currentXMLBase = URLBuilder.buildURL(this.previousXMLBase, xmlBase); } catch (MalformedURLException e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-28 01:30:29
|
Revision: 7088 Author: victormote Date: 2006-04-27 18:30:21 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7088&view=rev Log Message: ----------- Revert 7073. The NPE was caused by a font-configuration problem that should ordinarily be caught during validation, but was not due to some erroneous changes to the font-config DTD. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-04-27 23:13:19 UTC (rev 7087) +++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-04-28 01:30:21 UTC (rev 7088) @@ -398,10 +398,6 @@ * the font file has failed */ org.axsl.font.Font fsf = this.registeredFont.getFreeStandingFont(); - if (fsf == null) { - throw new FontException("Unable to bootstrap a System Font from a " - + "FreeStanding Font."); - } returnedFont = new Font(fsf.getFontName(), Font.PLAIN, SystemFont.INITIAL_FONT_SIZE); /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 23:13:27
|
Revision: 7087 Author: victormote Date: 2006-04-27 16:13:19 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7087&view=rev Log Message: ----------- Style changes only. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-04-27 23:11:06 UTC (rev 7086) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-04-27 23:13:19 UTC (rev 7087) @@ -104,8 +104,8 @@ processFileSet(); if (actioncount + skippedcount == 0) { - task.log("No files processed. No files were selected by the filesets " - + "and no fofile was set." , Project.MSG_WARN); + task.log("No files processed. No files were selected by the " + + "filesets and no fofile was set." , Project.MSG_WARN); return; } if (skippedcount > 0) { @@ -195,7 +195,8 @@ sessionConfig.optionBaseDirectory(), Project.MSG_DEBUG); } catch (Exception e) { - task.log("Error setting base directory: " + e, Project.MSG_ERR); + task.log("Error setting base directory: " + e, + Project.MSG_ERR); } // Render if "force" flag is set OR This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 23:11:40
|
Revision: 7086 Author: victormote Date: 2006-04-27 16:11:06 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7086&view=rev Log Message: ----------- Rename some classes with excessively long names. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java Added Paths: ----------- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyContentHandlerProxy.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvDistanceBetween.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvLabelSeparation.java Removed Paths: ------------- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterAlternatives.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -51,7 +51,7 @@ private ContentHandler orgHandler; /** Proxy for easy SAX event generation */ - protected EasyGenerationContentHandlerProxy handler; + protected EasyContentHandlerProxy handler; /** Error handler */ protected ErrorHandler errorHandler; @@ -78,7 +78,7 @@ */ public void setContentHandler(ContentHandler handler) { this.orgHandler = handler; - this.handler = new EasyGenerationContentHandlerProxy(handler); + this.handler = new EasyContentHandlerProxy(handler); } /** Copied: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyContentHandlerProxy.java (from rev 7085, trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java) =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyContentHandlerProxy.java (rev 0) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyContentHandlerProxy.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -0,0 +1,232 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * 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. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* +$Id$ +*/ + +package org.foray.demo.embed.tools; + +import org.xml.sax.ContentHandler; +import org.xml.sax.Locator; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; + +/** + * This class is an implementation of ContentHandler which acts as a proxy to + * another ContentHandler and has the purpose to provide a few handy methods + * that make life easier when generating SAX events. + * <br> + * Note: This class is only useful for simple cases with no namespaces. + */ + +public class EasyContentHandlerProxy implements ContentHandler { + + /** An empty Attributes object used when no attributes are needed. */ + public static final Attributes EMPTY_ATTS = new AttributesImpl(); + + private ContentHandler target; + + + /** + * Main constructor. + * @param forwardTo ContentHandler to forward the SAX event to. + */ + public EasyContentHandlerProxy(ContentHandler forwardTo) { + this.target = forwardTo; + } + + + /** + * Sends the notification of the beginning of an element. + * @param name Name for the element. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. + */ + public void startElement(String name) throws SAXException { + startElement(name, EMPTY_ATTS); + } + + + /** + * Sends the notification of the beginning of an element. + * @param name Name for the element. + * @param atts The attributes attached to the element. If there are no + * attributes, it shall be an empty Attributes object. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. + */ + public void startElement(String name, Attributes atts) throws SAXException { + startElement(null, name, name, atts); + } + + + /** + * Send a String of character data. + * @param s The content String + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. + */ + public void characters(String s) throws SAXException { + target.characters(s.toCharArray(), 0, s.length()); + } + + + /** + * Send the notification of the end of an element. + * @param name Name for the element. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. + */ + public void endElement(String name) throws SAXException { + endElement(null, name, name); + } + + + /** + * Sends notifications for a whole element with some String content. + * @param name Name for the element. + * @param value Content of the element. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. + */ + public void element(String name, String value) throws SAXException { + element(name, value, EMPTY_ATTS); + } + + + /** + * Sends notifications for a whole element with some String content. + * @param name Name for the element. + * @param value Content of the element. + * @param atts The attributes attached to the element. If there are no + * attributes, it shall be an empty Attributes object. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. + */ + public void element(String name, String value, Attributes atts) + throws SAXException { + startElement(name, atts); + if (value != null) { + characters(value.toCharArray(), 0, value.length()); + } + endElement(name); + } + + /* =========== ContentHandler interface =========== */ + + /** + * @see org.xml.sax.ContentHandler#setDocumentLocator(Locator) + */ + public void setDocumentLocator(Locator locator) { + target.setDocumentLocator(locator); + } + + + /** + * @see org.xml.sax.ContentHandler#startDocument() + */ + public void startDocument() throws SAXException { + target.startDocument(); + } + + + /** + * @see org.xml.sax.ContentHandler#endDocument() + */ + public void endDocument() throws SAXException { + target.endDocument(); + } + + + /** + * @see org.xml.sax.ContentHandler#startPrefixMapping(String, String) + */ + public void startPrefixMapping(String prefix, String uri) + throws SAXException { + target.startPrefixMapping(prefix, uri); + } + + + /** + * @see org.xml.sax.ContentHandler#endPrefixMapping(String) + */ + public void endPrefixMapping(String prefix) throws SAXException { + target.endPrefixMapping(prefix); + } + + + /** + * @see org.xml.sax.ContentHandler#startElement(String, String, String, + * Attributes) + */ + public void startElement(String namespaceURI, String localName, + String qName, Attributes atts) throws SAXException { + target.startElement(namespaceURI, localName, qName, atts); + } + + + /** + * @see org.xml.sax.ContentHandler#endElement(String, String, String) + */ + public void endElement(String namespaceURI, String localName, String qName) + throws SAXException { + target.endElement(namespaceURI, localName, qName); + } + + + /** + * @see org.xml.sax.ContentHandler#characters(char[], int, int) + */ + public void characters(char[] ch, int start, int length) + throws SAXException { + target.characters(ch, start, length); + } + + + /** + * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int) + */ + public void ignorableWhitespace(char[] ch, int start, int length) + throws SAXException { + target.ignorableWhitespace(ch, start, length); + } + + + /** + * @see org.xml.sax.ContentHandler#processingInstruction(String, String) + */ + public void processingInstruction(String target, String data) + throws SAXException { + this.target.processingInstruction(target, data); + } + + + /** + * @see org.xml.sax.ContentHandler#skippedEntity(String) + */ + public void skippedEntity(String name) throws SAXException { + target.skippedEntity(name); + } + +} \ No newline at end of file Deleted: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -1,232 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * 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. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* -$Id$ -*/ - -package org.foray.demo.embed.tools; - -import org.xml.sax.ContentHandler; -import org.xml.sax.Locator; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; - -/** - * This class is an implementation of ContentHandler which acts as a proxy to - * another ContentHandler and has the purpose to provide a few handy methods - * that make life easier when generating SAX events. - * <br> - * Note: This class is only useful for simple cases with no namespaces. - */ - -public class EasyGenerationContentHandlerProxy implements ContentHandler { - - /** An empty Attributes object used when no attributes are needed. */ - public static final Attributes EMPTY_ATTS = new AttributesImpl(); - - private ContentHandler target; - - - /** - * Main constructor. - * @param forwardTo ContentHandler to forward the SAX event to. - */ - public EasyGenerationContentHandlerProxy(ContentHandler forwardTo) { - this.target = forwardTo; - } - - - /** - * Sends the notification of the beginning of an element. - * @param name Name for the element. - * @throws SAXException Any SAX exception, possibly wrapping another - * exception. - */ - public void startElement(String name) throws SAXException { - startElement(name, EMPTY_ATTS); - } - - - /** - * Sends the notification of the beginning of an element. - * @param name Name for the element. - * @param atts The attributes attached to the element. If there are no - * attributes, it shall be an empty Attributes object. - * @throws SAXException Any SAX exception, possibly wrapping another - * exception. - */ - public void startElement(String name, Attributes atts) throws SAXException { - startElement(null, name, name, atts); - } - - - /** - * Send a String of character data. - * @param s The content String - * @throws SAXException Any SAX exception, possibly wrapping another - * exception. - */ - public void characters(String s) throws SAXException { - target.characters(s.toCharArray(), 0, s.length()); - } - - - /** - * Send the notification of the end of an element. - * @param name Name for the element. - * @throws SAXException Any SAX exception, possibly wrapping another - * exception. - */ - public void endElement(String name) throws SAXException { - endElement(null, name, name); - } - - - /** - * Sends notifications for a whole element with some String content. - * @param name Name for the element. - * @param value Content of the element. - * @throws SAXException Any SAX exception, possibly wrapping another - * exception. - */ - public void element(String name, String value) throws SAXException { - element(name, value, EMPTY_ATTS); - } - - - /** - * Sends notifications for a whole element with some String content. - * @param name Name for the element. - * @param value Content of the element. - * @param atts The attributes attached to the element. If there are no - * attributes, it shall be an empty Attributes object. - * @throws SAXException Any SAX exception, possibly wrapping another - * exception. - */ - public void element(String name, String value, Attributes atts) - throws SAXException { - startElement(name, atts); - if (value != null) { - characters(value.toCharArray(), 0, value.length()); - } - endElement(name); - } - - /* =========== ContentHandler interface =========== */ - - /** - * @see org.xml.sax.ContentHandler#setDocumentLocator(Locator) - */ - public void setDocumentLocator(Locator locator) { - target.setDocumentLocator(locator); - } - - - /** - * @see org.xml.sax.ContentHandler#startDocument() - */ - public void startDocument() throws SAXException { - target.startDocument(); - } - - - /** - * @see org.xml.sax.ContentHandler#endDocument() - */ - public void endDocument() throws SAXException { - target.endDocument(); - } - - - /** - * @see org.xml.sax.ContentHandler#startPrefixMapping(String, String) - */ - public void startPrefixMapping(String prefix, String uri) - throws SAXException { - target.startPrefixMapping(prefix, uri); - } - - - /** - * @see org.xml.sax.ContentHandler#endPrefixMapping(String) - */ - public void endPrefixMapping(String prefix) throws SAXException { - target.endPrefixMapping(prefix); - } - - - /** - * @see org.xml.sax.ContentHandler#startElement(String, String, String, - * Attributes) - */ - public void startElement(String namespaceURI, String localName, - String qName, Attributes atts) throws SAXException { - target.startElement(namespaceURI, localName, qName, atts); - } - - - /** - * @see org.xml.sax.ContentHandler#endElement(String, String, String) - */ - public void endElement(String namespaceURI, String localName, String qName) - throws SAXException { - target.endElement(namespaceURI, localName, qName); - } - - - /** - * @see org.xml.sax.ContentHandler#characters(char[], int, int) - */ - public void characters(char[] ch, int start, int length) - throws SAXException { - target.characters(ch, start, length); - } - - - /** - * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int) - */ - public void ignorableWhitespace(char[] ch, int start, int length) - throws SAXException { - target.ignorableWhitespace(ch, start, length); - } - - - /** - * @see org.xml.sax.ContentHandler#processingInstruction(String, String) - */ - public void processingInstruction(String target, String data) - throws SAXException { - this.target.processingInstruction(target, data); - } - - - /** - * @see org.xml.sax.ContentHandler#skippedEntity(String) - */ - public void skippedEntity(String name) throws SAXException { - target.skippedEntity(name); - } - -} \ No newline at end of file Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -102,8 +102,8 @@ import org.foray.fotree.fo.prop.Pause; import org.foray.fotree.fo.prop.Pitch; import org.foray.fotree.fo.prop.PlayDuring; -import org.foray.fotree.fo.prop.ProvisionalDistanceBetweenStarts; -import org.foray.fotree.fo.prop.ProvisionalLabelSeparation; +import org.foray.fotree.fo.prop.ProvDistanceBetween; +import org.foray.fotree.fo.prop.ProvLabelSeparation; import org.foray.fotree.fo.prop.RefId; import org.foray.fotree.fo.prop.RegionName; import org.foray.fotree.fo.prop.RelativeDimension; @@ -1730,12 +1730,12 @@ public int getProvisionalDistanceBetweenStarts( int ipdNearestBlockAreaNotLineArea) { - ProvisionalDistanceBetweenStarts property - = (ProvisionalDistanceBetweenStarts) + ProvDistanceBetween property + = (ProvDistanceBetween) getProperty(Constants .FOPROP_PROVISIONAL_DISTANCE_BETWEEN_STARTS); if (property == null) { - return ProvisionalDistanceBetweenStarts.traitValueNoInstance(fobj, + return ProvDistanceBetween.traitValueNoInstance(fobj, ipdNearestBlockAreaNotLineArea); } return property.traitValue(fobj, ipdNearestBlockAreaNotLineArea); @@ -1743,11 +1743,11 @@ public int getProvisionalLabelSeparation(int ipdNearestBlockAreaNotLineArea) { - ProvisionalLabelSeparation property - = (ProvisionalLabelSeparation) + ProvLabelSeparation property + = (ProvLabelSeparation) getProperty(Constants.FOPROP_PROVISIONAL_LABEL_SEPARATION); if (property == null) { - return ProvisionalLabelSeparation.traitValueNoInstance(fobj, + return ProvLabelSeparation.traitValueNoInstance(fobj, ipdNearestBlockAreaNotLineArea); } return property.traitValue(fobj, ipdNearestBlockAreaNotLineArea); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -67,8 +67,8 @@ import org.foray.fotree.fo.obj.RegionBody; import org.foray.fotree.fo.obj.RegionEnd; import org.foray.fotree.fo.obj.RegionStart; -import org.foray.fotree.fo.obj.RepeatablePageMasterAlternatives; -import org.foray.fotree.fo.obj.RepeatablePageMasterReference; +import org.foray.fotree.fo.obj.RepeatablePMAlternatives; +import org.foray.fotree.fo.obj.RepeatablePMReference; import org.foray.fotree.fo.obj.RetrieveMarker; import org.foray.fotree.fo.obj.Root; import org.foray.fotree.fo.obj.SimplePageMaster; @@ -267,11 +267,11 @@ column); } case Constants.FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES: { - return new RepeatablePageMasterAlternatives(parent, propertyList, + return new RepeatablePMAlternatives(parent, propertyList, systemId, line, column); } case Constants.FO_REPEATABLE_PAGE_MASTER_REFERENCE: { - return new RepeatablePageMasterReference(parent, propertyList, + return new RepeatablePMReference(parent, propertyList, systemId, line, column); } case Constants.FO_RETRIEVE_MARKER: { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -103,8 +103,8 @@ import org.foray.fotree.fo.prop.Pause; import org.foray.fotree.fo.prop.Pitch; import org.foray.fotree.fo.prop.PlayDuring; -import org.foray.fotree.fo.prop.ProvisionalDistanceBetweenStarts; -import org.foray.fotree.fo.prop.ProvisionalLabelSeparation; +import org.foray.fotree.fo.prop.ProvDistanceBetween; +import org.foray.fotree.fo.prop.ProvLabelSeparation; import org.foray.fotree.fo.prop.RefId; import org.foray.fotree.fo.prop.RegionName; import org.foray.fotree.fo.prop.RelativeDimension; @@ -826,11 +826,11 @@ attributeValue); } case Constants.FOPROP_PROVISIONAL_DISTANCE_BETWEEN_STARTS: { - return new ProvisionalDistanceBetweenStarts(propertyList, + return new ProvDistanceBetween(propertyList, enumeration, propertyFullName, attributeValue); } case Constants.FOPROP_PROVISIONAL_LABEL_SEPARATION: { - return new ProvisionalLabelSeparation(propertyList, + return new ProvLabelSeparation(propertyList, enumeration, propertyFullName, attributeValue); } case Constants.FOPROP_REF_ID: { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -40,16 +40,16 @@ */ public class ConditionalPageMasterReference extends FObj { - private RepeatablePageMasterAlternatives repeatablePageMasterAlternatives; + private RepeatablePMAlternatives repeatablePageMasterAlternatives; public ConditionalPageMasterReference(FObj parent, PropertyList propertyList, String systemId, int line, int column) throws FOTreeException { super(parent, propertyList, systemId, line, column); - if (parent instanceof RepeatablePageMasterAlternatives) { + if (parent instanceof RepeatablePMAlternatives) { this.repeatablePageMasterAlternatives = - (RepeatablePageMasterAlternatives)parent; + (RepeatablePMAlternatives)parent; if (traitMasterReference() == null) { logWarning(getFullName() + " has no master-reference, and " + "will be ignored."); Copied: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java (from rev 7085, trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterAlternatives.java) =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -0,0 +1,110 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * 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. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* +$Id$ +*/ + +package org.foray.fotree.fo.obj; + +import org.foray.fotree.FONode; +import org.foray.fotree.FObj; +import org.foray.fotree.Namespace; +import org.foray.fotree.PropertyList; + +import org.axsl.fotree.FOTreeException; + +import java.util.ArrayList; + +/** + * The XSL-FO "repeatable-page-master-alternatives" object. + */ +public class RepeatablePMAlternatives extends FObj + implements SubSequenceSpecifier { + + private PageSequenceMaster pageSequenceMaster; + + /** + * Max times this page master can be repeated. + * INFINITE is used for the unbounded case + */ + private int numberConsumed = 0; + + private ArrayList conditionalPageMasterRefs; + + public RepeatablePMAlternatives(FObj parent, + PropertyList propertyList, String systemId, int line, int column) + throws FOTreeException { + super(parent, propertyList, systemId, line, column); + + if (parent instanceof PageSequenceMaster) { + this.pageSequenceMaster = (PageSequenceMaster)parent; + this.pageSequenceMaster.addSubsequenceSpecifier(this); + } else { + throwException(getFullName() + " must be child of " + + "fo:page-sequence-master."); + } + conditionalPageMasterRefs = new ArrayList(); + } + + public String getName() { + return "repeatable-page-master-alternatives"; + } + + public void addConditionalPageMasterReference( + ConditionalPageMasterReference cpmr) { + this.conditionalPageMasterRefs.add(cpmr); + } + + public String getNextPageMasterName(boolean isOddPage, + boolean isFirstPage, + boolean isEmptyPage) { + if (numberConsumed < traitMaximumRepeats()) { + numberConsumed++; + } else { + return null; + } + + for (int i = 0; i < conditionalPageMasterRefs.size(); i++) { + ConditionalPageMasterReference cpmr = + (ConditionalPageMasterReference)conditionalPageMasterRefs + .get(i); + if (cpmr.isValid(isOddPage, isFirstPage, isEmptyPage)) { + return cpmr.traitMasterReference(); + } + } + return null; + } + + public void reset() { + this.numberConsumed = 0; + } + + public byte getNodeType() { + return FONode.NODE_REPEAT_PAGE_MASTER_ALTERN; + } + + public Namespace getNamespace() { + return this.getFOTreeBuilder().getFONamespace(); + } + +} Copied: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java (from rev 7085, trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterReference.java) =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -0,0 +1,93 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * 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. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* +$Id$ +*/ + +package org.foray.fotree.fo.obj; + +import org.foray.fotree.FONode; +import org.foray.fotree.FObj; +import org.foray.fotree.Namespace; +import org.foray.fotree.PropertyList; + +import org.axsl.fotree.FOTreeException; + + +/** + * The XSL-FO "repeatable-page-master-reference" object. + */ +public class RepeatablePMReference extends PageMasterReference + implements SubSequenceSpecifier { + + private int maximumRepeats; + private int numberConsumed = 0; + + public RepeatablePMReference(FObj parent, PropertyList propertyList, + String systemId, int line, int column) throws FOTreeException { + super(parent, propertyList, systemId, line, column); + String masterReference = traitMasterReference(); + if (! masterReference.equals("")) { + if (parent instanceof PageSequenceMaster) { + PageSequenceMaster pageSequenceMaster + = (PageSequenceMaster)parent; + pageSequenceMaster.addSubsequenceSpecifier(this); + } else { + throwException(getFullName() + " must be child of " + + "fo:page-sequence-master."); + } + } else { + logWarning(getFullName() + " has no master-reference, and will be " + + "ignored."); + } + this.maximumRepeats = traitMaximumRepeats(); + } + + public String getName() { + return "repeatable-page-master-reference"; + } + + public String getNextPageMasterName(boolean isOddPage, + boolean isFirstPage, + boolean isEmptyPage) { + if (numberConsumed < maximumRepeats) { + numberConsumed++; + } else { + return null; + } + return traitMasterName(); + } + + public void reset() { + this.numberConsumed = 0; + } + + public byte getNodeType() { + return FONode.NODE_REPEAT_PAGE_MASTER_REF; + } + + public Namespace getNamespace() { + return this.getFOTreeBuilder().getFONamespace(); + } + +} Deleted: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterAlternatives.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterAlternatives.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterAlternatives.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -1,110 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * 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. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* -$Id$ -*/ - -package org.foray.fotree.fo.obj; - -import org.foray.fotree.FONode; -import org.foray.fotree.FObj; -import org.foray.fotree.Namespace; -import org.foray.fotree.PropertyList; - -import org.axsl.fotree.FOTreeException; - -import java.util.ArrayList; - -/** - * Models the fo:repeatable-page-master-alternatives object. - */ -public class RepeatablePageMasterAlternatives extends FObj - implements SubSequenceSpecifier { - - private PageSequenceMaster pageSequenceMaster; - - /** - * Max times this page master can be repeated. - * INFINITE is used for the unbounded case - */ - private int numberConsumed = 0; - - private ArrayList conditionalPageMasterRefs; - - public RepeatablePageMasterAlternatives(FObj parent, - PropertyList propertyList, String systemId, int line, int column) - throws FOTreeException { - super(parent, propertyList, systemId, line, column); - - if (parent instanceof PageSequenceMaster) { - this.pageSequenceMaster = (PageSequenceMaster)parent; - this.pageSequenceMaster.addSubsequenceSpecifier(this); - } else { - throwException(getFullName() + " must be child of " - + "fo:page-sequence-master."); - } - conditionalPageMasterRefs = new ArrayList(); - } - - public String getName() { - return "repeatable-page-master-alternatives"; - } - - public void addConditionalPageMasterReference( - ConditionalPageMasterReference cpmr) { - this.conditionalPageMasterRefs.add(cpmr); - } - - public String getNextPageMasterName(boolean isOddPage, - boolean isFirstPage, - boolean isEmptyPage) { - if (numberConsumed < traitMaximumRepeats()) { - numberConsumed++; - } else { - return null; - } - - for (int i = 0; i < conditionalPageMasterRefs.size(); i++) { - ConditionalPageMasterReference cpmr = - (ConditionalPageMasterReference)conditionalPageMasterRefs - .get(i); - if (cpmr.isValid(isOddPage, isFirstPage, isEmptyPage)) { - return cpmr.traitMasterReference(); - } - } - return null; - } - - public void reset() { - this.numberConsumed = 0; - } - - public byte getNodeType() { - return FONode.NODE_REPEAT_PAGE_MASTER_ALTERN; - } - - public Namespace getNamespace() { - return this.getFOTreeBuilder().getFONamespace(); - } - -} Deleted: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterReference.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterReference.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -1,93 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * 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. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* -$Id$ -*/ - -package org.foray.fotree.fo.obj; - -import org.foray.fotree.FONode; -import org.foray.fotree.FObj; -import org.foray.fotree.Namespace; -import org.foray.fotree.PropertyList; - -import org.axsl.fotree.FOTreeException; - - -/** - * Models the fo:repeatable-page-master-reference object. - */ -public class RepeatablePageMasterReference extends PageMasterReference - implements SubSequenceSpecifier { - - private int maximumRepeats; - private int numberConsumed = 0; - - public RepeatablePageMasterReference(FObj parent, PropertyList propertyList, - String systemId, int line, int column) throws FOTreeException { - super(parent, propertyList, systemId, line, column); - String masterReference = traitMasterReference(); - if (! masterReference.equals("")) { - if (parent instanceof PageSequenceMaster) { - PageSequenceMaster pageSequenceMaster - = (PageSequenceMaster)parent; - pageSequenceMaster.addSubsequenceSpecifier(this); - } else { - throwException(getFullName() + " must be child of " - + "fo:page-sequence-master."); - } - } else { - logWarning(getFullName() + " has no master-reference, and will be " - + "ignored."); - } - this.maximumRepeats = traitMaximumRepeats(); - } - - public String getName() { - return "repeatable-page-master-reference"; - } - - public String getNextPageMasterName(boolean isOddPage, - boolean isFirstPage, - boolean isEmptyPage) { - if (numberConsumed < maximumRepeats) { - numberConsumed++; - } else { - return null; - } - return traitMasterName(); - } - - public void reset() { - this.numberConsumed = 0; - } - - public byte getNodeType() { - return FONode.NODE_REPEAT_PAGE_MASTER_REF; - } - - public Namespace getNamespace() { - return this.getFOTreeBuilder().getFONamespace(); - } - -} Copied: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvDistanceBetween.java (from rev 7085, trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java) =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvDistanceBetween.java (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvDistanceBetween.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -0,0 +1,113 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * 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. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* +$Id$ +*/ + +package org.foray.fotree.fo.prop; + +import org.foray.fotree.FObj; +import org.foray.fotree.Property; +import org.foray.fotree.PropertyException; +import org.foray.fotree.PropertyList; +import org.foray.fotree.value.DtLength; +import org.foray.fotree.value.DtPercentage; +import org.foray.fotree.value.PropertyKeyword; +import org.foray.fotree.value.PropertyValue; + +import org.axsl.common.Constants; + +/** + * The XSL-FO "provisional-distance-between-starts" property. + */ +public class ProvDistanceBetween extends Property { + + /** Initial value is 24 pts, per the spec. */ + private static final int initialValue = 24000; + + private static final short[] validKeywords = { + Constants.FOVAL_INHERIT, + }; + + public ProvDistanceBetween(PropertyList propertyList, + short enumeration, String propertyFullName, String attributeValue) + throws PropertyException { + super(propertyList, enumeration); + this.value = createPropertyValue(propertyList, attributeValue); + } + + public PropertyValue createPropertyValue(PropertyList propertyList, + String value) throws PropertyException { + PropertyValue pv = checkKeywords(value); + if (pv != null) { + return pv; + } + pv = standardParse(propertyList, value, false, false); + if (pv instanceof DtLength) { + return pv; + } + if (pv instanceof DtPercentage) { + return pv; + } + throw new PropertyException(unexpectedValueMessage(value, + propertyList)); + } + + public int traitValue(FObj fobj, int ipdNearestBlockAreaNotLineArea) { + if (this.value instanceof PropertyKeyword) { + short keyword = ((PropertyKeyword) value).getValue(); + switch (keyword) { + case Constants.FOVAL_INHERIT: { + return fobj.getFObjParent() + .traitProvisionalDistanceBetweenStarts( + ipdNearestBlockAreaNotLineArea); + } + } + } + if (this.value instanceof DtLength) { + return ((DtLength) this.value).getValue(fobj.traitFontSize(), 0); + } + if (this.value instanceof DtPercentage) { + int base = ipdNearestBlockAreaNotLineArea; + DtPercentage percentageDT = (DtPercentage) this.value; + float percentage = percentageDT.getValue(); + return Math.round(percentage * base / 100); + } + return initialValue; + } + + public static int traitValueNoInstance(FObj fobj, + int ipdNearestBlockAreaNotLineArea) { + FObj parent = fobj.getFObjParent(); + if (parent == null) { + return initialValue; + } + return parent.traitProvisionalDistanceBetweenStarts( + ipdNearestBlockAreaNotLineArea); + } + + protected short[] getValidKeywords() { + return validKeywords; + } + +} Copied: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvLabelSeparation.java (from rev 7085, trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java) =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvLabelSeparation.java (rev 0) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvLabelSeparation.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -0,0 +1,112 @@ +/* + * Copyright 2004 The FOray Project. + * http://www.foray.org + * + * 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. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * + */ + +/* +$Id$ +*/ + +package org.foray.fotree.fo.prop; + +import org.foray.fotree.FObj; +import org.foray.fotree.Property; +import org.foray.fotree.PropertyException; +import org.foray.fotree.PropertyList; +import org.foray.fotree.value.DtLength; +import org.foray.fotree.value.DtPercentage; +import org.foray.fotree.value.PropertyKeyword; +import org.foray.fotree.value.PropertyValue; + +import org.axsl.common.Constants; + +/** + * The XSL-FO "provisional-label-separation" property. + */ +public class ProvLabelSeparation extends Property { + + /** Initial value is 6 pts, per the spec. */ + private static final int initialValue = 6000; + + private static final short[] validKeywords = { + Constants.FOVAL_INHERIT, + }; + + public ProvLabelSeparation(PropertyList propertyList, + short enumeration, String propertyFullName, String attributeValue) + throws PropertyException { + super(propertyList, enumeration); + this.value = createPropertyValue(propertyList, attributeValue); + } + + public PropertyValue createPropertyValue(PropertyList propertyList, + String value) throws PropertyException { + PropertyValue pv = checkKeywords(value); + if (pv != null) { + return pv; + } + pv = standardParse(propertyList, value, false, false); + if (pv instanceof DtLength) { + return pv; + } + if (pv instanceof DtPercentage) { + return pv; + } + throw new PropertyException(unexpectedValueMessage(value, + propertyList)); + } + + public int traitValue(FObj fobj, int ipdNearestBlockAreaNotLineArea) { + if (this.value instanceof PropertyKeyword) { + short keyword = ((PropertyKeyword) value).getValue(); + switch (keyword) { + case Constants.FOVAL_INHERIT: { + return fobj.getFObjParent().traitProvisionalLabelSeparation( + ipdNearestBlockAreaNotLineArea); + } + } + } + if (this.value instanceof DtLength) { + return ((DtLength) this.value).getValue(fobj.traitFontSize(), 0); + } + if (this.value instanceof DtPercentage) { + int base = ipdNearestBlockAreaNotLineArea; + DtPercentage percentageDT = (DtPercentage) this.value; + float percentage = percentageDT.getValue(); + return Math.round(percentage * base / 100); + } + return initialValue; + } + + public static int traitValueNoInstance(FObj fobj, + int ipdNearestBlockAreaNotLineArea) { + FObj parent = fobj.getFObjParent(); + if (parent == null) { + return initialValue; + } + return parent.traitProvisionalLabelSeparation( + ipdNearestBlockAreaNotLineArea); + } + + protected short[] getValidKeywords() { + return validKeywords; + } + +} Deleted: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -1,110 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * 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. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* -$Id$ -*/ - -package org.foray.fotree.fo.prop; - -import org.foray.fotree.FObj; -import org.foray.fotree.Property; -import org.foray.fotree.PropertyException; -import org.foray.fotree.PropertyList; -import org.foray.fotree.value.DtLength; -import org.foray.fotree.value.DtPercentage; -import org.foray.fotree.value.PropertyKeyword; -import org.foray.fotree.value.PropertyValue; - -import org.axsl.common.Constants; - -public class ProvisionalDistanceBetweenStarts extends Property { - - /** Initial value is 24 pts, per the spec. */ - private static final int initialValue = 24000; - - private static final short[] validKeywords = { - Constants.FOVAL_INHERIT, - }; - - public ProvisionalDistanceBetweenStarts(PropertyList propertyList, - short enumeration, String propertyFullName, String attributeValue) - throws PropertyException { - super(propertyList, enumeration); - this.value = createPropertyValue(propertyList, attributeValue); - } - - public PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - PropertyValue pv = checkKeywords(value); - if (pv != null) { - return pv; - } - pv = standardParse(propertyList, value, false, false); - if (pv instanceof DtLength) { - return pv; - } - if (pv instanceof DtPercentage) { - return pv; - } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); - } - - public int traitValue(FObj fobj, int ipdNearestBlockAreaNotLineArea) { - if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); - switch (keyword) { - case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent() - .traitProvisionalDistanceBetweenStarts( - ipdNearestBlockAreaNotLineArea); - } - } - } - if (this.value instanceof DtLength) { - return ((DtLength) this.value).getValue(fobj.traitFontSize(), 0); - } - if (this.value instanceof DtPercentage) { - int base = ipdNearestBlockAreaNotLineArea; - DtPercentage percentageDT = (DtPercentage) this.value; - float percentage = percentageDT.getValue(); - return Math.round(percentage * base / 100); - } - return initialValue; - } - - public static int traitValueNoInstance(FObj fobj, - int ipdNearestBlockAreaNotLineArea) { - FObj parent = fobj.getFObjParent(); - if (parent == null) { - return initialValue; - } - return parent.traitProvisionalDistanceBetweenStarts( - ipdNearestBlockAreaNotLineArea); - } - - protected short[] getValidKeywords() { - return validKeywords; - } - -} Deleted: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java 2006-04-27 22:50:20 UTC (rev 7085) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java 2006-04-27 23:11:06 UTC (rev 7086) @@ -1,109 +0,0 @@ -/* - * Copyright 2004 The FOray Project. - * http://www.foray.org - * - * 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. - * - * This work is in part derived from the following work(s), used with the - * permission of the licensor: - * Apache FOP, licensed by the Apache Software Foundation - * - */ - -/* -$Id$ -*/ - -package org.foray.fotree.fo.prop; - -import org.foray.fotree.FObj; -import org.foray.fotree.Property; -import org.foray.fotree.PropertyException; -import org.foray.fotree.PropertyList; -import org.foray.fotree.value.DtLength; -import org.foray.fotree.value.DtPercentage; -import org.foray.fotree.value.PropertyKeyword; -import org.foray.fotree.value.PropertyValue; - -import org.axsl.common.Constants; - -public class ProvisionalLabelSeparation extends Property { - - /** Initial value is 6 pts, per the spec. */ - private static final int initialValue = 6000; - - private static final short[] validKeywords = { - Constants.FOVAL_INHERIT, - }; - - public ProvisionalLabelSeparation(PropertyList propertyList, - short enumeration, String propertyFullName, String attributeValue) - throws PropertyException { - super(propertyList, enumeration); - this.value = createPropertyValue(propertyList, attributeValue); - } - - public PropertyValue createPropertyValue(PropertyList propertyList, - String value) throws PropertyException { - PropertyValue pv = checkKeywords(value); - if (pv != null) { - return pv; - } - pv = standardParse(propertyList, value, false, false); - if (pv instanceof DtLength) { - return pv; - } - if (pv instanceof DtPercentage) { - return pv; - } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); - } - - public int traitValue(FObj fobj, int ipdNearestBlockAreaNotLineArea) { - if (this.value instanceof PropertyKeyword) { - short keyword = ((PropertyKeyword) value).getValue(); - switch (keyword) { - case Constants.FOVAL_INHERIT: { - return fobj.getFObjParent().traitProvisionalLabelSeparation( - ipdNearestBlockAreaNotLineArea); - } - } - } - if (this.value instanceof DtLength) { - return ((DtLength) this.value).getValue(fobj.traitFontSize(), 0); - } - if (this.value instanceof DtPercentage) { - int base = ipdNearestBlockAreaNotLineArea; - DtPercentage percentageDT = (DtPercentage) this.value; - float percentage = percentageDT.getValue(); - return Math.round(percentage * base / 100); - } - return initialValue; - } - - public static int traitValueNoInstance(FObj fobj, - int ipdNearestBlockAreaNotLineArea) { - FObj parent = fobj.getFObjParent(); - if (parent == null) { - return initialValue; - } - return parent.traitProvisionalLabelSeparation( - ipdNearestBlockAreaNotLineArea); - } - - protected short[] getValidKeywords() { - return validKeywords; - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 22:53:52
|
Revision: 7085 Author: victormote Date: 2006-04-27 15:50:20 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7085&view=rev Log Message: ----------- Style changes only. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java trunk/foray/foray-app/src/java/org/foray/app/DocumentReader.java trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java trunk/foray/foray-font/src/java/org/foray/font/Subset.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHMTX.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutput.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDF.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterAlternatives.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ExternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsRepeated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberRowsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Orphans.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pitch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RefId.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RegionName.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Role.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RuleThickness.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Script.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SourceDocument.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SpeechRate.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Src.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetPresentationContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetProcessingContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetStylesheet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlignLast.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAltitude.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDepth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextShadow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TreatAsWordSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VerticalAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Volume.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Widows.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ZIndex.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/TIFFGraphic.java trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFToUnicodeCMap.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXObject.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFDocumentGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFImageElementBridge.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTranscoder.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/RunLengthEncodeOutputStream.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/Hyphen.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationTree.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/PatternParser.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/SerializeHyphPattern.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/TernaryTree.java trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -79,7 +79,8 @@ private void init() throws FOrayException { this.userMessage = new UserMessage(getLogger()); try { - UIManager.setLookAndFeel(new javax.swing.plaf.metal.MetalLookAndFeel()); + UIManager.setLookAndFeel( + new javax.swing.plaf.metal.MetalLookAndFeel()); } catch (Exception e) { e.printStackTrace(); } @@ -170,10 +171,12 @@ try { URL url = getClass().getResource(path); - /* The following code was added by Alex Alishevskikh [al...@op...] - to fix for crashes on machines with unsupported user languages */ + /* The following code was added by Alex Alishevskikh + * [al...@op...] to fix for crashes on machines with + * unsupported user languages */ if (url == null) { - // if the given resource file not found, the english resource uses as default + /* if the given resource file not found, the english resource + * uses as default */ path = path.substring(0, path.lastIndexOf(".")) + ".en"; url = getClass().getResource(path); } Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -354,7 +354,8 @@ } /** - * checks whether all necessary information has been given in a consistent way + * checks whether all necessary information has been given in a consistent + * way */ private void checkSettings() throws FOrayException, FileNotFoundException { if (inputmode == NOT_SET) { @@ -368,10 +369,12 @@ if (inputmode == XSLT_INPUT) { // check whether xml *and* xslt file have been set if (xmlfile == null) { - throw new FOrayException("XML file must be specified for the tranform mode"); + throw new FOrayException("XML file must be specified for the " + + "transform mode"); } if (xsltfile == null) { - throw new FOrayException("XSLT file must be specified for the tranform mode"); + throw new FOrayException("XSLT file must be specified for the " + + "transform mode"); } // warning if fofile has been set in xslt mode @@ -548,7 +551,8 @@ } /** - * shows the commandline syntax including a summary of all available options and some examples + * shows the commandline syntax including a summary of all available + * options and some examples */ public static void printUsage(Log logger) { logger.error("\nUSAGE\nFOray [options] [-fo|-xml] infile " @@ -560,26 +564,39 @@ + " configure a session-option key-value pair\n" + "\n" + " [INPUT]\n" - + " infile xsl:fo input file (the same as the next)\n" + + " infile xsl:fo input file (the same as the " + + "next)\n" + " -fo infile xsl:fo input file\n" - + " -xml infile xml input file, must be used together with -xsl\n" + + " -xml infile xml input file, must be used together " + + "with -xsl\n" + " -xsl stylesheet xslt stylesheet\n" + "\n" + " [OUTPUT]\n" - + " outfile input will be rendered as pdf file into outfile\n" - + " -pdf outfile input will be rendered as pdf file (outfile req'd)\n" + + " outfile input will be rendered as pdf file " + + "into outfile\n" + + " -pdf outfile input will be rendered as pdf file " + + "(outfile req'd)\n" + " -awt input will be displayed on screen\n" - + " -mif outfile input will be rendered as mif file (outfile req'd)\n" - + " -pcl outfile input will be rendered as pcl file (outfile req'd)\n" - + " -ps outfile input will be rendered as PostScript file (outfile req'd)\n" - + " -txt outfile input will be rendered as text file (outfile req'd)\n" - + " -svg outfile input will be rendered as an svg slides file (outfile req'd)\n" - + " -at outfile representation of area tree as XML (outfile req'd)\n" - + " -print input file will be rendered and sent to the printer\n" - + " see print specific options with \"-print help\"\n" + + " -mif outfile input will be rendered as mif file " + + "(outfile req'd)\n" + + " -pcl outfile input will be rendered as pcl file " + + "(outfile req'd)\n" + + " -ps outfile input will be rendered as PostScript " + + "file (outfile req'd)\n" + + " -txt outfile input will be rendered as text file " + + "(outfile req'd)\n" + + " -svg outfile input will be rendered as an svg slides " + + "file (outfile req'd)\n" + + " -at outfile representation of area tree as XML " + + "(outfile req'd)\n" + + " -print input file will be rendered and sent to " + + "the printer\n" + + " see print specific options with " + + "\"-print help\"\n" + "\n [Examples]\n" + " FOray foo.fo foo.pdf\n" - + " FOray -fo foo.fo -pdf foo.pdf (does the same as the previous line)\n" + + " FOray -fo foo.fo -pdf foo.pdf (does the same as the " + + "previous line)\n" + " FOray -xsl foo.xsl -xml foo.xml -pdf foo.pdf\n" + " FOray foo.fo -mif foo.mif\n" + " FOray foo.fo -print or FOray -print foo.fo\n" Modified: trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -130,7 +130,8 @@ */ private XMLReader createParser() throws FOrayException { try { - SAXParserFactory spf = javax.xml.parsers.SAXParserFactory.newInstance(); + SAXParserFactory spf = javax.xml.parsers.SAXParserFactory + .newInstance(); spf.setNamespaceAware(true); XMLReader xmlReader = spf.newSAXParser().getXMLReader(); logger.info("Config: Using " @@ -155,7 +156,8 @@ } /** - * extracts the element and attribute name and sets the fitting status and datatype values + * extracts the element and attribute name and sets the fitting status and + * datatype values */ public void startElement(String uri, String localName, String qName, Attributes attributes) { @@ -179,7 +181,8 @@ } // end startElement /** - * stores subentries or entries into their hashes (map for subentries, configuration for entry) + * stores subentries or entries into their hashes (map for subentries, + * configuration for entry) */ public void endElement(String uri, String localName, String qName) { if (localName.equals("entry")) { Modified: trunk/foray/foray-app/src/java/org/foray/app/DocumentReader.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/DocumentReader.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/DocumentReader.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -118,17 +118,16 @@ throws SAXNotRecognizedException, SAXNotSupportedException { if ("http://xml.org/sax/features/namespaces".equals(name)) { return _namespaces; - } else if ("http://xml.org/sax/features/namespace-prefixes".equals(name)) { + } else if ( + "http://xml.org/sax/features/namespace-prefixes".equals(name)) { return _namespace_prefixes; } else { throw new SAXNotRecognizedException("Feature '" + name - + "' not recognized or supported by Document2SAXAdapter"); + + "' not recognized or supported by Document2SAXAdapter"); } } - - /** * Set the state of a feature. * @@ -160,11 +159,12 @@ throws SAXNotRecognizedException, SAXNotSupportedException { if ("http://xml.org/sax/features/namespaces".equals(name)) { _namespaces = value; - } else if ("http://xml.org/sax/features/namespace-prefixes".equals(name)) { + } else if ( + "http://xml.org/sax/features/namespace-prefixes".equals(name)) { _namespace_prefixes = value; } else { throw new SAXNotRecognizedException("Feature '" + name - + "' not recognized or supported by Document2SAXAdapter"); + + "' not recognized or supported by Document2SAXAdapter"); } } @@ -201,11 +201,9 @@ public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException { throw new SAXNotRecognizedException("Property '" + name - + "' not recognized or supported by Document2SAXAdapter"); + + "' not recognized or supported by Document2SAXAdapter"); } - - /** * Set the value of a property. * @@ -236,7 +234,7 @@ public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException { throw new SAXNotRecognizedException("Property '" + name - + "' not recognized or supported by Document2SAXAdapter"); + + "' not recognized or supported by Document2SAXAdapter"); } @@ -401,7 +399,8 @@ if (input instanceof DocumentInputSource) { Document document = ((DocumentInputSource)input).getDocument(); if (_contentHandler == null) { - throw new SAXException("ContentHandler is null. Please use setContentHandler()"); + throw new SAXException("ContentHandler is null. Please use " + + "setContentHandler()"); } /* most of this code is modified from John Cowan's */ @@ -436,8 +435,9 @@ _contentHandler.characters(array, 0, datalen); break; case Node.PROCESSING_INSTRUCTION_NODE: - _contentHandler.processingInstruction(currentNode.getNodeName(), - currentNode.getNodeValue()); + _contentHandler.processingInstruction( + currentNode.getNodeName(), + currentNode.getNodeValue()); break; case Node.ELEMENT_NODE: NamedNodeMap map = currentNode.getAttributes(); @@ -468,9 +468,10 @@ _contentHandler.endDocument(); break; case Node.ELEMENT_NODE: - _contentHandler.endElement(currentNode.getNamespaceURI(), - currentNode.getLocalName(), - currentNode.getNodeName()); + _contentHandler.endElement( + currentNode.getNamespaceURI(), + currentNode.getLocalName(), + currentNode.getNodeName()); break; } @@ -485,7 +486,8 @@ } } else { - throw new SAXException("DocumentReader only supports parsing of a DocumentInputSource"); + throw new SAXException("DocumentReader only supports parsing of a " + + "DocumentInputSource"); } } @@ -493,9 +495,9 @@ /** - * DocumentReader requires a DocumentInputSource, so this is not - * implements and simply throws a SAXException. Use parse(DocumentInputSource) - * instead + * DocumentReader requires a DocumentInputSource, so this is not implements + * and simply throws a SAXException. + * Use parse(DocumentInputSource) instead * * @param systemId The system identifier (URI). * @exception SAXException Any SAX exception, possibly Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -207,7 +207,8 @@ if (this.textServer != null) { return; } - URL hyphenationDir = this.configuration.optionHyphenationBaseDirectory(); + URL hyphenationDir = this.configuration + .optionHyphenationBaseDirectory(); this.textServer = new org.foray.text.TextServer(getLogger(), hyphenationDir); } Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -248,8 +248,10 @@ getLogger().debug("Total memory used: " + memoryUsed + "Kb"); if (!MEM_PROFILE_WITH_GC) { - getLogger().debug(" Memory use is indicative; no GC was performed"); - getLogger().debug(" These figures should not be used comparatively"); + getLogger().debug(" Memory use is indicative; no GC was " + + "performed"); + getLogger().debug(" These figures should not be used " + + "comparatively"); } long timeUsed = System.currentTimeMillis() - startTime; @@ -257,7 +259,8 @@ getLogger().debug("Total time used: " + timeUsed + "ms"); getLogger().debug("Pages rendered: " + pageCount); if (pageCount != 0) { - getLogger().debug("Avg render time: " + (timeUsed / pageCount) + "ms/page"); + getLogger().debug("Avg render time: " + (timeUsed / pageCount) + + "ms/page"); } } @@ -288,7 +291,8 @@ } catch (FOrayException e) { throw new SAXException(e); } - this.results.haveFormattedPageSequence(pageSequence, pageCollection); + this.results.haveFormattedPageSequence(pageSequence, + pageCollection); try { processQueue(false); } catch (FOrayException e1) { Modified: trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -80,7 +80,8 @@ private void initTransformer() throws FOrayException { try { - transformer = TransformerFactory.newInstance().newTransformer (xsltSource); + transformer = TransformerFactory.newInstance().newTransformer( + xsltSource); } catch(Exception ex) { throw new FOrayException(ex); @@ -162,7 +163,8 @@ * data is fed into FOray. This should help to avoid memory problems * @param xmlfile The xmlfile containing the text data * @param xsltfile An xslt stylesheet - * @return XMLFilter an XMLFilter which can be chained together with other XMLReaders or XMLFilters + * @return XMLFilter an XMLFilter which can be chained together with other + * XMLReaders or XMLFilters */ public XMLFilter getXMLFilter(File xmlfile, File xsltfile) throws FOrayException { Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -48,9 +48,12 @@ * <li>format -> MIME type of the format to generate ex. "application/pdf"</li> * <li>outfile -> output filename</li> * <li>baseDir -> directory to work from</li> - * <li>userconfig -> file with user configuration (same as the "-c" command line option)</li> - * <li>messagelevel -> (error | warn | info | verbose | debug) level to output non-error messages</li> - * <li>logFiles -> Controls whether the names of the files that are processed are logged or not</li> + * <li>userconfig -> file with user configuration (same as the "-c" command + * line option)</li> + * <li>messagelevel -> (error | warn | info | verbose | debug) level to output + * non-error messages</li> + * <li>logFiles -> Controls whether the names of the files that are processed + * are logged or not</li> * </ul> */ public class FOrayAntTask extends Task { @@ -170,7 +173,8 @@ messageType = Project.MSG_VERBOSE; } else if (messageLevel.equalsIgnoreCase("debug")) { messageType = Project.MSG_DEBUG; - } else if (messageLevel.equalsIgnoreCase("err") || messageLevel.equalsIgnoreCase("error")) { + } else if (messageLevel.equalsIgnoreCase("err") + || messageLevel.equalsIgnoreCase("error")) { messageType = Project.MSG_ERR; } else if (messageLevel.equalsIgnoreCase("warn")) { messageType = Project.MSG_WARN; @@ -182,7 +186,8 @@ } /** - * Returns the message type corresponding to Property.MSG_(INFO | VERBOSE | DEBUG) + * Returns the message type corresponding to Property.MSG_(INFO | VERBOSE | + * DEBUG) * representing the current message level. */ public int getMessageType() { Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -97,7 +97,8 @@ logger.info("===================================="); logger.info("The following files differ:"); boolean broke = false; - for (Iterator keys = diff.keySet().iterator(); keys.hasNext(); ) { + for (Iterator keys = diff.keySet().iterator(); + keys.hasNext(); ) { Object fname = keys.next(); Boolean pass = (Boolean)diff.get(fname); logger.info("file: " + fname @@ -107,7 +108,8 @@ } } if (broke) { - throw new BuildException("Working tests have been changed."); + throw new BuildException( + "Working tests have been changed."); } } } catch (MalformedURLException mue) { @@ -142,8 +144,8 @@ loader); Method get = cla.getMethod("getVersion", new Class[]{}); if (!get.invoke(null, new Object[]{}).equals(refVersion)) { - throw new BuildException("Reference jar is not correct version it must be: " - + refVersion); + throw new BuildException("Reference jar is not correct " + + "version it must be: " + refVersion); } } catch (IllegalAccessException iae) { failed = true; Modified: trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -80,8 +80,10 @@ * This will take a specified testsuite xml and process all * tests in it. * The command line options are: - * -b to set the base directory for where the testsuite and associated files are - * -failOnly to process only the tests which are specified as fail in the test results + * -b to set the base directory for where the testsuite and associated + * files are + * -failOnly to process only the tests which are specified as fail in the + * test results * -pdf to output the result as pdf */ public static void main(String[] args) { @@ -170,8 +172,8 @@ testsuite = doc.getDocumentElement(); if (testsuite.hasAttributes()) { - String profile = - testsuite.getAttributes().getNamedItem("profile").getNodeValue(); + String profile = testsuite.getAttributes().getNamedItem( + "profile").getNodeValue(); log.debug("testing test suite:" + profile); } @@ -346,8 +348,9 @@ parser.setFeature("http://xml.org/sax/features/namespace-prefixes", true); } catch (SAXException e) { - throw new FOrayException("Error in setting up parser feature namespace-prefixes\n" - + "You need a parser which supports SAX version 2", e); + throw new FOrayException("Error in setting up parser feature " + + "namespace-prefixes\n" + + "You need a parser which supports SAX version 2", e); } } Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -90,7 +90,8 @@ throws IOException { URL url = getClass().getResource(path); if (url == null) { - // if the given resource file not found, the english resource uses as default + /* if the given resource file not found, the english resource uses + * as default */ path = path.substring(0, path.lastIndexOf(".")) + ".en"; url = getClass().getResource(path); } Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -58,8 +58,8 @@ inputHandler.getInputSource(), inputHandler.getParser()); //Setup Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget OutputStream out = new FileOutputStream(pdf); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -73,8 +73,8 @@ FOrayDocument document = new FOrayDocument(driver, transformer, source); //Setup Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget OutputStream out = new FileOutputStream(pdf); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -52,7 +52,8 @@ try { //Setup XSLT TransformerFactory factory = TransformerFactory.newInstance(); - Transformer transformer = factory.newTransformer(new StreamSource(xslt)); + Transformer transformer = factory.newTransformer( + new StreamSource(xslt)); //Setup input for XSLT transformation Source src = new StreamSource(xml); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -71,8 +71,8 @@ FOrayDocument document = new FOrayDocument(driver, transformer, source); //Setup Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget OutputStream out = new FileOutputStream(pdf); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -45,7 +45,8 @@ if (input instanceof ProjectTeamInputSource) { parse(((ProjectTeamInputSource)input).getProjectTeam()); } else { - throw new SAXException("Unsupported InputSource specified. Must be a ProjectTeamInputSource"); + throw new SAXException("Unsupported InputSource specified. Must " + + "be a ProjectTeamInputSource"); } } @@ -57,7 +58,8 @@ */ public void parse(ProjectTeam projectTeam) throws SAXException { if (projectTeam == null) { - throw new NullPointerException("Parameter projectTeam must not be null"); + throw new NullPointerException("Parameter projectTeam must not be " + + "null"); } if (handler == null) { throw new IllegalStateException("ContentHandler not set"); @@ -81,7 +83,8 @@ */ protected void generateFor(ProjectTeam projectTeam) throws SAXException { if (projectTeam == null) { - throw new NullPointerException("Parameter projectTeam must not be null"); + throw new NullPointerException("Parameter projectTeam must not be " + + "null"); } if (handler == null) { throw new IllegalStateException("ContentHandler not set"); @@ -102,9 +105,11 @@ * @param projectMember ProjectMember object to use * @throws SAXException In case of a problem during SAX event generation */ - protected void generateFor(ProjectMember projectMember) throws SAXException { + protected void generateFor(ProjectMember projectMember) + throws SAXException { if (projectMember == null) { - throw new NullPointerException("Parameter projectMember must not be null"); + throw new NullPointerException("Parameter projectMember must not " + + "be null"); } if (handler == null) { throw new IllegalStateException("ContentHandler not set"); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -20,7 +20,9 @@ * */ -/* $Id$ */ +/* +$Id$ +*/ package org.foray.demo.embed.tools; @@ -58,7 +60,8 @@ /** * Sends the notification of the beginning of an element. * @param name Name for the element. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void startElement(String name) throws SAXException { startElement(name, EMPTY_ATTS); @@ -70,7 +73,8 @@ * @param name Name for the element. * @param atts The attributes attached to the element. If there are no * attributes, it shall be an empty Attributes object. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void startElement(String name, Attributes atts) throws SAXException { startElement(null, name, name, atts); @@ -80,7 +84,8 @@ /** * Send a String of character data. * @param s The content String - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void characters(String s) throws SAXException { target.characters(s.toCharArray(), 0, s.length()); @@ -90,7 +95,8 @@ /** * Send the notification of the end of an element. * @param name Name for the element. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void endElement(String name) throws SAXException { endElement(null, name, name); @@ -101,7 +107,8 @@ * Sends notifications for a whole element with some String content. * @param name Name for the element. * @param value Content of the element. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void element(String name, String value) throws SAXException { element(name, value, EMPTY_ATTS); @@ -114,9 +121,11 @@ * @param value Content of the element. * @param atts The attributes attached to the element. If there are no * attributes, it shall be an empty Attributes object. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ - public void element(String name, String value, Attributes atts) throws SAXException { + public void element(String name, String value, Attributes atts) + throws SAXException { startElement(name, atts); if (value != null) { characters(value.toCharArray(), 0, value.length()); @@ -153,7 +162,8 @@ /** * @see org.xml.sax.ContentHandler#startPrefixMapping(String, String) */ - public void startPrefixMapping(String prefix, String uri) throws SAXException { + public void startPrefixMapping(String prefix, String uri) + throws SAXException { target.startPrefixMapping(prefix, uri); } @@ -167,9 +177,11 @@ /** - * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes) + * @see org.xml.sax.ContentHandler#startElement(String, String, String, + * Attributes) */ - public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException { + public void startElement(String namespaceURI, String localName, + String qName, Attributes atts) throws SAXException { target.startElement(namespaceURI, localName, qName, atts); } @@ -177,7 +189,8 @@ /** * @see org.xml.sax.ContentHandler#endElement(String, String, String) */ - public void endElement(String namespaceURI, String localName, String qName) throws SAXException { + public void endElement(String namespaceURI, String localName, String qName) + throws SAXException { target.endElement(namespaceURI, localName, qName); } @@ -185,7 +198,8 @@ /** * @see org.xml.sax.ContentHandler#characters(char[], int, int) */ - public void characters(char[] ch, int start, int length) throws SAXException { + public void characters(char[] ch, int start, int length) + throws SAXException { target.characters(ch, start, length); } @@ -193,7 +207,8 @@ /** * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int) */ - public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { + public void ignorableWhitespace(char[] ch, int start, int length) + throws SAXException { target.ignorableWhitespace(ch, start, length); } @@ -201,7 +216,8 @@ /** * @see org.xml.sax.ContentHandler#processingInstruction(String, String) */ - public void processingInstruction(String target, String data) throws SAXException { + public void processingInstruction(String target, String data) + throws SAXException { this.target.processingInstruction(target, data); } Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -166,8 +166,8 @@ FOrayDocument document = setupSAXDocument(session, inputHandler); // Setup the Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget ByteArrayOutputStream output = new ByteArrayOutputStream(); @@ -209,8 +209,8 @@ source); // Setup the Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget ByteArrayOutputStream output = new ByteArrayOutputStream(); Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -48,7 +48,7 @@ * * Example URL: http://servername/foray/servlet/DemoPrintServlet?fo=readme.fo * Example URL: - * http://servername/foray/servlet/DemoPrintServlet?xml=data.xml&xsl=format.xsl + * http://servername/foray/servlet/DemoPrintServlet?xml=data.xml&xsl=format.xsl * Compiling: you will need * - servlet_2_2.jar * - foray.jar @@ -92,7 +92,8 @@ } /** - * Renders an FO generated using an XML and a stylesheet to the default printer. + * Renders an FO generated using an XML and a stylesheet to the default + * printer. */ public void renderXML(File xmlFile, File xslFile, HttpServletResponse response) throws ServletException { Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -118,8 +118,8 @@ private FOrayTarget setupTarget(FOrayDocument document) throws FOrayException { // Setup the Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget ByteArrayOutputStream output = new ByteArrayOutputStream(); FOrayTarget target = new FOrayTarget(document, renderer, null, output); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -33,8 +33,8 @@ public class BlockContainerRA extends ContainerRA implements BlockContainerArea { - private int xPosition; // should be able to take value 'left' and 'right' too - private int yPosition; // should be able to take value 'top' and 'bottom' too + private int xPosition; + private int yPosition; public BlockContainerRA(FObj generatedBy, Area parentArea, int xPosition, int yPosition) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -82,18 +82,21 @@ SpanRA spanArea = (SpanRA)spanAreas.get(spanAreas.size() - 1); - if ((span == Constants.FOVAL_ALL) && (spanArea.traitColumnCount() == 1)) { + if ((span == Constants.FOVAL_ALL) + && (spanArea.traitColumnCount() == 1)) { // return the single column area in the same span area return spanArea.getCurrentColumnArea(); } else if ((span == Constants.FOVAL_NONE) - && (spanArea.traitColumnCount() == this.traitColumnCount())) { + && (spanArea.traitColumnCount() + == this.traitColumnCount())) { // return the current column area in the same span area return spanArea.getCurrentColumnArea(); } else if (span == Constants.FOVAL_ALL) { // create new span area with one column; return column area return addSpanArea(1); } else if (span == Constants.FOVAL_NONE) { - // create new span area with multiple columns; return first column area + /* create new span area with multiple columns; return first column + * area */ return addSpanArea(this.traitColumnCount()); } else { throw new FOrayException("BodyAreaContainer::getNextArea(): Span " Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -45,7 +45,8 @@ Area overflowArea = getParentArea().getOverflowArea(this); // If parent SpanArea can create another column if (overflowArea instanceof NormalFlowRA) { - return new NormalBlockArea(childRequesting.traitGeneratedBy(), this); + return new NormalBlockArea(childRequesting.traitGeneratedBy(), + this); } // If a new page was created if (overflowArea instanceof MainRA) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -182,7 +182,8 @@ } int lastPageNumber = previousPageCollection.getCurrentPageNumber() - 1; int computedPageNumber = pageSeq.traitInitialPageNumber(lastPageNumber); - if (pageSeq.getRawInitialPageNumber() == Constants.FOVAL_NOT_A_KEYWORD) { + if (pageSeq.getRawInitialPageNumber() + == Constants.FOVAL_NOT_A_KEYWORD) { /* * If the user set the page number explicitly, there is nothing * else to do but set it and go. @@ -229,7 +230,8 @@ */ PageSequence previousPageSequence = previousPageCollection.getPageSequence(); - if (previousPageSequence.traitForcePageCount() == Constants.FOVAL_AUT... [truncated message content] |
|
From: <vic...@us...> - 2006-04-27 20:49:56
|
Revision: 7084 Author: victormote Date: 2006-04-27 13:49:09 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7084&view=rev Log Message: ----------- Style changes only. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -139,7 +139,7 @@ } catch (javax.xml.parsers.ParserConfigurationException e) { throw new FOrayException(e); } catch (SAXException e) { - throw new FOrayException( e); + throw new FOrayException(e); } } Modified: trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -96,7 +96,7 @@ } catch (javax.xml.parsers.ParserConfigurationException e) { throw new FOrayException(e); } catch (SAXException e) { - throw new FOrayException( e); + throw new FOrayException(e); } } Modified: trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -82,7 +82,7 @@ try { transformer = TransformerFactory.newInstance().newTransformer (xsltSource); } - catch( Exception ex) { + catch(Exception ex) { throw new FOrayException(ex); } } Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -138,10 +138,11 @@ // OR output file doesn't exist OR // output file is older than input file if (task.getForce() || !outf.exists() - || (task.getFofile().lastModified() > outf.lastModified() )) { + || (task.getFofile().lastModified() > outf.lastModified())) { render(task.getFofile(), outf); actioncount++; - } else if (outf.exists() && (task.getFofile().lastModified() <= outf.lastModified() )) { + } else if (outf.exists() + && (task.getFofile().lastModified() <= outf.lastModified())) { skippedcount++; } } @@ -201,10 +202,11 @@ // OR output file doesn't exist OR // output file is older than input file if (task.getForce() || !outf.exists() - || (f.lastModified() > outf.lastModified() )) { + || (f.lastModified() > outf.lastModified())) { render(f, outf); actioncount++; - } else if (outf.exists() && (f.lastModified() <= outf.lastModified() )) { + } else if (outf.exists() + && (f.lastModified() <= outf.lastModified())) { skippedcount++; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -142,7 +142,7 @@ if (leaderSpaceAvailable == 0) { return; } - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof LeaderArea) { LeaderArea leader = (LeaderArea) object; @@ -167,7 +167,7 @@ private int computeLeaderCapacity(int unusedSpace) { // First, compute how much capacity the leaders have. int leaderSpaceAvailable = 0; - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof LeaderArea) { LeaderArea leader = (LeaderArea) object; @@ -223,7 +223,7 @@ if (wordSpacingCapacity == 0) { return; } - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -245,7 +245,7 @@ */ private int computeWordSpacingCapacity(int unusedSpace) { int wordSpacingCapacity = 0; - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -292,7 +292,7 @@ if (letterSpacingCapacity == 0) { return; } - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -314,7 +314,7 @@ */ private int computeLetterSpacingCapacity(int unusedSpace) { int letterSpacingCapacity = 0; - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -366,7 +366,7 @@ * absorb a relatively larger share of the change in word-space. */ int totalDenominator = 0; - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -377,7 +377,7 @@ if (totalDenominator == 0) { return; } - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -399,7 +399,7 @@ */ public void verticalAlign() { int maxHeight = this.getProgressionDimension(); - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object o = children.get(i); if (o instanceof AbstractInlineArea) { AbstractInlineArea ia = (AbstractInlineArea)o; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -502,7 +502,7 @@ PageCollection areaTree = getPageCollection(); if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_PAGE_SEQUENCE) { PageSequence pageSequence = areaTree.getCurrentPageSequence(); - if (pageSequence == getPageSequence() ) { + if (pageSequence == getPageSequence()) { additionalMarkers = areaTree.getCurrentPageSequenceMarkers(); } } else if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_DOCUMENT) { Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -231,7 +231,7 @@ */ public int smallCapsSize(int fontSize) { float percent = this.registeredFontDesc.getSimulateSmallCaps(); - if ( percent == Float.NaN) { + if (percent == Float.NaN) { return fontSize; } return Math.round(fontSize * percent / 100); Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -238,7 +238,7 @@ protected InputStream getFontInputStream() { FontFileReader fontFileReader = this.registeredFont.getFontFileReader(); - if ( fontFileReader == null) { + if (fontFileReader == null) { return null; } InputStream instream = null; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -41,7 +41,7 @@ protected void addCharacters(char data[], int start, int length, String systemId, int line, int column) { - if (textBuffer == null ) { + if (textBuffer == null) { textBuffer = new StringBuffer(); } textBuffer.append(data,start,length); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -68,7 +68,7 @@ boolean isEmptyPage) { // page-position int pagePosition = traitPagePosition(); - if (isFirstPage ) { + if (isFirstPage) { if (pagePosition == Constants.FOVAL_REST) { return false; } else if (pagePosition == Constants.FOVAL_LAST) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -89,7 +89,7 @@ public void reset() { currentSubSequenceNumber = -1; currentSubSequence = null; - for (int i = 0; i< subSequenceSpecifiers.size(); i++ ) { + for (int i = 0; i< subSequenceSpecifiers.size(); i++) { ((SubSequenceSpecifier)subSequenceSpecifiers.get(i)).reset(); } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -100,13 +100,13 @@ return Math.round(percentage * ipdContainingRA / 100); } if (this.value instanceof FnLabelEnd - && direction == DtWritingMode.DIRECTION_END ) { + && direction == DtWritingMode.DIRECTION_END) { FnLabelEnd function = (FnLabelEnd) this.value; DtLength lengthDT = function.eval(fobj, ipdContainingRA); return lengthDT.getValue(fobj.traitFontSize(), 0); } if (this.value instanceof FnBodyStart - && direction == DtWritingMode.DIRECTION_START ) { + && direction == DtWritingMode.DIRECTION_START) { FnBodyStart function = (FnBodyStart) this.value; DtLength lengthDT = function.eval(fobj, ipdContainingRA); return lengthDT.getValue(fobj.traitFontSize(), 0); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -70,7 +70,7 @@ StringTokenizer st = new StringTokenizer(value); ArrayList tokenList = new ArrayList(st.countTokens()); while (st.hasMoreTokens()) { - tokenList.add( st.nextToken()); + tokenList.add(st.nextToken()); } if (tokenList.size() < 1 || tokenList.size() > MAX_TOKENS) { throw new PropertyException(unexpectedValueMessage(value, propertyList)); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -77,7 +77,7 @@ } NormalBlockArea ba = la.ancestorNormalBlockArea(); start = addTextItemToLine(la, lineText, start, end); - while ( start != -1) { + while (start != -1) { la = layout.createNextLineArea(ba); if (la == null) { return start; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -170,7 +170,7 @@ public void setPendingFootnotes(PageRA pageArea, ArrayList footnotes) { pageArea.footnotes = footnotes; if (footnotes != null) { - for (int i = 0; i < footnotes.size(); i++ ) { + for (int i = 0; i < footnotes.size(); i++) { FootnoteBody fb = (FootnoteBody)footnotes.get(i); FootnoteBodyPL fbPL = ((FootnoteBodyPL) getFObjProxy(fb)); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -50,7 +50,7 @@ } public static boolean isPageBreak(int code) { - switch( code) { + switch(code) { case FORCE_PAGE_BREAK: case FORCE_PAGE_BREAK_EVEN: case FORCE_PAGE_BREAK_ODD: Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -279,7 +279,7 @@ for (int i = 0; i < table.getTableColumns().size(); i++) { TableColumn c = (TableColumn) table.getTableColumns().get(i); TableColumnPL tablecolumnPL = (TableColumnPL) getFObjProxy(c); - if ( c != null) { + if (c != null) { tablecolumnPL.setHeight(areaContainer.crBPD()); } } Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -451,7 +451,7 @@ */ if (procedureStack.size() > 0) { procedureBeingBuilt = (ArrayList) - procedureStack.get(procedureStack.size() - 1); + procedureStack.get(procedureStack.size() - 1); procedureStack.remove(procedureStack.size() - 1); // Otherwise, make it null. } else { Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -225,7 +225,7 @@ } try { - Graphic graphic = new TempImage(null, width, height, result, mask); + Graphic graphic = new TempImage(null, width, height, result, mask); AffineTransform at = getTransform(); double[] matrix = new double[6]; at.getMatrix(matrix); Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -481,7 +481,7 @@ //log.debug("drawing SVG image: "+x+"/"+y+" "+w+"/"+h); SVGSVGElement svg = ((SVGDocument) doc).getRootElement(); AffineTransform at = ViewBox.getPreserveAspectRatioTransform(svg, - w/1000f , h/1000f ); + w/1000f , h/1000f); ctx = null; builder = null; Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -513,7 +513,7 @@ } public void render(PageArea page) { - if ( firstPage ) { + if (firstPage) { firstPage = false; } else { currentStream.add(pageEnding); Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -528,7 +528,7 @@ public void startOutput() throws IOException { getLogger().debug("rendering areas to XML"); this.writer = new PrintWriter(this.getOutputStream()); - this.writer.write( "<?xml version=\"1.0\"?>\n<!-- produced by " + this.writer.write("<?xml version=\"1.0\"?>\n<!-- produced by " + this.getOutputControl().getVersion() + " -->\n"); writeStartTag("<AreaTree>"); } Modified: trunk/foray/scripts/checkstyle-config.xml =================================================================== --- trunk/foray/scripts/checkstyle-config.xml 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 20:49:09 UTC (rev 7084) @@ -30,16 +30,16 @@ </module> <module name="EmptyForInitializerPad"> <property name="option" value="nospace"/> - <property name="severity" value="ignore"/> + <property name="severity" value="warning"/> </module> <module name="ParenPad"> <property name="option" value="nospace"/> - <property name="severity" value="ignore"/> + <property name="severity" value="warning"/> <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/> </module> <module name="TabCharacter"> - <property name="severity" value="ignore"/> + <property name="severity" value="error"/> </module> </module> </module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 20:28:36
|
Revision: 7083 Author: victormote Date: 2006-04-27 13:28:07 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7083&view=rev Log Message: ----------- Style changes only. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java trunk/foray/foray-app/src/java/org/foray/app/Starter.java trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -39,14 +39,14 @@ import javax.xml.parsers.SAXParserFactory; -abstract public class InputHandler { +public abstract class InputHandler { Log logger; - abstract public InputSource getInputSource() throws IOException ; - abstract public XMLReader getParser() throws FOrayException; + public abstract InputSource getInputSource() throws IOException ; + public abstract XMLReader getParser() throws FOrayException; - abstract public void run(FOrayDocument driver) throws FOrayException; + public abstract void run(FOrayDocument driver) throws FOrayException; public InputHandler(Log logger) { this.logger = logger; Modified: trunk/foray/foray-app/src/java/org/foray/app/Starter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -54,7 +54,7 @@ this.inputHandler = inputHandler; } - abstract public void run() throws FOrayException; + public abstract void run() throws FOrayException; public Log getLogger() { return this.logger; Modified: trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -46,7 +46,7 @@ * of a leaf node's children is requested. * Note: This code was copied from javax.swing.tree.DefaultMutableTreeNode. */ - static public final Enumeration EMPTY_ENUMERATION = new Enumeration() { + public static final Enumeration EMPTY_ENUMERATION = new Enumeration() { public boolean hasMoreElements() { return false; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -38,7 +38,7 @@ public class ProvisionalDistanceBetweenStarts extends Property { /** Initial value is 24 pts, per the spec. */ - private final static int initialValue = 24000; + private static final int initialValue = 24000; private static final short[] validKeywords = { Constants.FOVAL_INHERIT, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -38,7 +38,7 @@ public class ProvisionalLabelSeparation extends Property { /** Initial value is 6 pts, per the spec. */ - private final static int initialValue = 6000; + private static final int initialValue = 6000; private static final short[] validKeywords = { Constants.FOVAL_INHERIT, Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -35,7 +35,7 @@ * This char is returned when a Unicode character cannot be encoded using * the PDFDocEncoding. */ - public final static char INVALID_PDF_DOC_ENCODING = 0xffff; + public static final char INVALID_PDF_DOC_ENCODING = 0xffff; public PDFTextString(PDFDocument doc, String string) { super(doc, string, null); Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -31,11 +31,11 @@ */ public abstract class PSStack { - public final static byte STACK_UNKNOWN = 1; - public final static byte STACK_OPERAND = 2; - public final static byte STACK_DICTIONARY = 3; - public final static byte STACK_EXECUTION = 4; - public final static byte STACK_GRAPHICS_STATE = 5; + public static final byte STACK_UNKNOWN = 1; + public static final byte STACK_OPERAND = 2; + public static final byte STACK_DICTIONARY = 3; + public static final byte STACK_EXECUTION = 4; + public static final byte STACK_GRAPHICS_STATE = 5; private PSInterpreter interpreter; Modified: trunk/foray/scripts/checkstyle-config.xml =================================================================== --- trunk/foray/scripts/checkstyle-config.xml 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 20:28:07 UTC (rev 7083) @@ -12,7 +12,7 @@ <module name="Checker"> <module name="TreeWalker"> <module name="ModifierOrder"> - <property name="severity" value="ignore"/> + <property name="severity" value="error"/> </module> <module name="NeedBraces"> <property name="severity" value="error"/> @@ -20,7 +20,7 @@ LITERAL_FOR, LITERAL_WHILE"/> </module> <module name="AvoidStarImport"> - <property name="severity" value="ignore"/> + <property name="severity" value="error"/> </module> <module name="LineLength"> <property name="ignorePattern" value="^$"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 20:06:24
|
Revision: 7082 Author: victormote Date: 2006-04-27 13:05:52 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7082&view=rev Log Message: ----------- Integrate checkstyle into the build scripts. Modified Paths: -------------- trunk/foray/foray-app/scripts/build.xml trunk/foray/foray-areatree/scripts/build.xml trunk/foray/foray-common/scripts/build.xml trunk/foray/foray-font/scripts/build.xml trunk/foray/foray-fotree/scripts/build.xml trunk/foray/foray-graphic/scripts/build.xml trunk/foray/foray-mif/scripts/build.xml trunk/foray/foray-output/scripts/build.xml trunk/foray/foray-pdf/scripts/build.xml trunk/foray/foray-pioneer/scripts/build.xml trunk/foray/foray-pretty/scripts/build.xml trunk/foray/foray-ps/scripts/build.xml trunk/foray/foray-render/scripts/build.xml trunk/foray/foray-text/scripts/build.xml trunk/foray/scripts/build.xml trunk/foray/scripts/foray-build.properties Modified: trunk/foray/foray-app/scripts/build.xml =================================================================== --- trunk/foray/foray-app/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-app/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -124,7 +124,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -173,6 +173,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-areatree/scripts/build.xml =================================================================== --- trunk/foray/foray-areatree/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-areatree/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -96,7 +96,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -150,6 +150,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-common/scripts/build.xml =================================================================== --- trunk/foray/foray-common/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-common/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -96,7 +96,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -150,6 +150,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-font/scripts/build.xml =================================================================== --- trunk/foray/foray-font/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-font/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -106,7 +106,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -160,6 +160,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-fotree/scripts/build.xml =================================================================== --- trunk/foray/foray-fotree/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-fotree/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -104,7 +104,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -158,6 +158,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-graphic/scripts/build.xml =================================================================== --- trunk/foray/foray-graphic/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-graphic/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -147,7 +147,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -201,6 +201,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-mif/scripts/build.xml =================================================================== --- trunk/foray/foray-mif/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-mif/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -92,7 +92,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -146,6 +146,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-output/scripts/build.xml =================================================================== --- trunk/foray/foray-output/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-output/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -105,7 +105,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -159,6 +159,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-pdf/scripts/build.xml =================================================================== --- trunk/foray/foray-pdf/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-pdf/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -96,7 +96,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -150,6 +150,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-pioneer/scripts/build.xml =================================================================== --- trunk/foray/foray-pioneer/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-pioneer/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -99,7 +99,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -153,6 +153,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-pretty/scripts/build.xml =================================================================== --- trunk/foray/foray-pretty/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-pretty/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -96,7 +96,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -150,6 +150,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-ps/scripts/build.xml =================================================================== --- trunk/foray/foray-ps/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-ps/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -99,7 +99,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -153,6 +153,28 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}"> + <include name="**/*.java"/> + <!-- The GlyphList classes cause checkstyle to exceed stack limits. --> + <exclude name="**/GlyphListAGL*.java"/> + </fileset> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-render/scripts/build.xml =================================================================== --- trunk/foray/foray-render/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-render/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -116,7 +116,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -170,6 +170,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-text/scripts/build.xml =================================================================== --- trunk/foray/foray-text/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-text/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -119,7 +119,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile, hyphenation" + <target name="package" depends="compile, style, hyphenation" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -181,6 +181,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/scripts/build.xml =================================================================== --- trunk/foray/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location=".."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -73,85 +73,85 @@ inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-pretty/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-ps/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-graphic/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-mif/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-font/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-text/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-pdf/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-fotree/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-areatree/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-pioneer/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-output/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-render/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-app/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> </target> @@ -333,9 +333,6 @@ <fileset dir="${jai.libs}"> <include name="jai*.jar"/> </fileset> - <fileset dir="${icu4j.libs}"> - <include name="icu*.jar"/> - </fileset> </path> <javadoc @@ -503,6 +500,54 @@ target="clean"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle"> + <ant antfile="${foray.home}/foray-common/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-pretty/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-ps/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-graphic/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-mif/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-font/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-text/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-pdf/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-fotree/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-areatree/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-pioneer/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-output/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-render/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-app/scripts/build.xml" + inheritall="false" + target="style"/> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/scripts/foray-build.properties =================================================================== --- trunk/foray/scripts/foray-build.properties 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/scripts/foray-build.properties 2006-04-27 20:05:52 UTC (rev 7082) @@ -46,4 +46,9 @@ # Sample typical value: # jai.libs = D:/rsrc/java/jai/jai-1_1_1_01/lib +# checkstyle.home +# Directory containing Checkstyle. +# Sample typical value: +# checkstyle.home = D:/rsrc/checkstyle/checkstyle4.1 + # Last line of file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 17:51:47
|
Revision: 7081 Author: victormote Date: 2006-04-27 10:49:59 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7081&view=rev Log Message: ----------- 1. Configure remaining packages to use checkstyle. 2. Fix current checkstyle errors. Modified Paths: -------------- trunk/foray/foray-app/.project trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java trunk/foray/foray-areatree/.project trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-common/src/java/org/foray/common/ClassService.java trunk/foray/foray-fotree/.project trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberGenerator.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java trunk/foray/foray-mif/.project trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java trunk/foray/foray-output/.project trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java trunk/foray/foray-pioneer/.project trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java trunk/foray/foray-pretty/.project trunk/foray/foray-render/.project trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTStream.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java trunk/foray/foray-text/.project trunk/foray/foray-text/src/java/org/foray/text/hyphen/ByteVector.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/CharVector.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/Hyphen.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationTree.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/PatternParser.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/TernaryTree.java Added Paths: ----------- trunk/foray/foray-app/.checkstyle trunk/foray/foray-areatree/.checkstyle trunk/foray/foray-common/.checkstyle trunk/foray/foray-font/.checkstyle trunk/foray/foray-fotree/.checkstyle trunk/foray/foray-graphic/.checkstyle trunk/foray/foray-mif/.checkstyle trunk/foray/foray-output/.checkstyle trunk/foray/foray-pdf/.checkstyle trunk/foray/foray-pioneer/.checkstyle trunk/foray/foray-pretty/.checkstyle trunk/foray/foray-ps/.checkstyle trunk/foray/foray-render/.checkstyle trunk/foray/foray-text/.checkstyle Added: trunk/foray/foray-app/.checkstyle =================================================================== --- trunk/foray/foray-app/.checkstyle (rev 0) +++ trunk/foray/foray-app/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-app/.project =================================================================== --- trunk/foray/foray-app/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -16,8 +16,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -150,10 +150,12 @@ // center window Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); Dimension frameSize = frame.getSize(); - if (frameSize.height > screenSize.height) + if (frameSize.height > screenSize.height) { frameSize.height = screenSize.height; - if (frameSize.width > screenSize.width) + } + if (frameSize.width > screenSize.width) { frameSize.width = screenSize.width; + } frame.setLocation((screenSize.width - frameSize.width) / 2, (screenSize.height - frameSize.height) / 2); frame.setVisible(true); Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -208,8 +208,9 @@ public void startRenderer() throws FOrayException { pageCount = 0; - if (MEM_PROFILE_WITH_GC) + if (MEM_PROFILE_WITH_GC) { System.gc(); // This takes time but gives better results + } initialMemory = runtime.totalMemory() - runtime.freeMemory(); startTime = System.currentTimeMillis(); @@ -235,8 +236,9 @@ throw new SAXException(e); } - if (MEM_PROFILE_WITH_GC) + if (MEM_PROFILE_WITH_GC) { System.gc(); // This takes time but gives better results + } long memoryNow = runtime.totalMemory() - runtime.freeMemory(); long memoryUsed = (memoryNow - initialMemory) / 1024L; Modified: trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -66,10 +66,12 @@ /* this code adapted from James Clark's in XT */ String path = file.getAbsolutePath(); String fSep = System.getProperty("file.separator"); - if (fSep != null && fSep.length() == 1) + if (fSep != null && fSep.length() == 1) { path = path.replace(fSep.charAt(0), '/'); - if (path.length() > 0 && path.charAt(0) != '/') + } + if (path.length() > 0 && path.charAt(0) != '/') { path = '/' + path; + } try { return new InputSource(new URL("file", null, path).toString()); } catch (MalformedURLException e) { Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -74,10 +74,12 @@ // center window Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); Dimension frameSize = frame.getSize(); - if (frameSize.height > screenSize.height) + if (frameSize.height > screenSize.height) { frameSize.height = screenSize.height; - if (frameSize.width > screenSize.width) + } + if (frameSize.width > screenSize.width) { frameSize.width = screenSize.width; + } frame.setLocation((screenSize.width - frameSize.width) / 2, (screenSize.height - frameSize.height) / 2); frame.setVisible(true); Added: trunk/foray/foray-areatree/.checkstyle =================================================================== --- trunk/foray/foray-areatree/.checkstyle (rev 0) +++ trunk/foray/foray-areatree/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-areatree/.project =================================================================== --- trunk/foray/foray-areatree/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-areatree/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -65,10 +65,11 @@ isNewSpanArea = false; int span = Constants.FOVAL_NONE; - if (fo instanceof Block) + if (fo instanceof Block) { span = ((Block)fo).traitSpan(); - else if (fo instanceof BlockContainer) + } else if (fo instanceof BlockContainer) { span = ((BlockContainer)fo).traitSpan(); + } if (this.getChildren().isEmpty()) { if (span == Constants.FOVAL_ALL) { @@ -118,33 +119,38 @@ * @return boolean True if we need to balance. */ public boolean isBalancingRequired(FObj fo) { - if (this.getChildren().isEmpty()) + if (this.getChildren().isEmpty()) { return false; + } List spanAreas = this.getChildren(); SpanRA spanArea = (SpanRA)spanAreas.get(spanAreas.size() - 1); - if (spanArea.isBalanced()) + if (spanArea.isBalanced()) { return false; + } int span = Constants.FOVAL_NONE; - if (fo instanceof Block) + if (fo instanceof Block) { span = ((Block)fo).traitSpan(); - else if (fo instanceof BlockContainer) + } else if (fo instanceof BlockContainer) { span = ((BlockContainer)fo).traitSpan(); + } - if ((span == Constants.FOVAL_ALL) && (spanArea.traitColumnCount() == 1)) + if ((span == Constants.FOVAL_ALL) + && (spanArea.traitColumnCount() == 1)) { return false; - else if ((span == Constants.FOVAL_NONE) - && (spanArea.traitColumnCount() == traitColumnCount())) + } else if ((span == Constants.FOVAL_NONE) + && (spanArea.traitColumnCount() == traitColumnCount())) { return false; - else if (span == Constants.FOVAL_ALL) + } else if (span == Constants.FOVAL_ALL) { return true; - else if (span == Constants.FOVAL_NONE) + } else if (span == Constants.FOVAL_NONE) { return false; - else + } else { return false; + } } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -75,10 +75,11 @@ } public void setCurrentColumn(int currentColumn) { - if (currentColumn <= traitColumnCount()) + if (currentColumn <= traitColumnCount()) { this.currentColumn = currentColumn; - else + } else { this.currentColumn = traitColumnCount(); + } } public NormalFlowRA getCurrentColumnArea() { @@ -106,8 +107,9 @@ int maxContentHeight = 0; for (Iterator e = getChildren().iterator(); e.hasNext(); ) { NormalFlowRA nextElm = (NormalFlowRA)e.next(); - if (nextElm.crBPD() > maxContentHeight) + if (nextElm.crBPD() > maxContentHeight) { maxContentHeight = nextElm.crBPD(); + } } return maxContentHeight; } Added: trunk/foray/foray-common/.checkstyle =================================================================== --- trunk/foray/foray-common/.checkstyle (rev 0) +++ trunk/foray/foray-common/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-common/src/java/org/foray/common/ClassService.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClassService.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-common/src/java/org/foray/common/ClassService.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -80,8 +80,9 @@ try { // First strip any comment... int idx = line.indexOf('#'); - if (idx != -1) + if (idx != -1) { line = line.substring(0, idx); + } // Trim whitespace. line = line.trim(); Added: trunk/foray/foray-font/.checkstyle =================================================================== --- trunk/foray/foray-font/.checkstyle (rev 0) +++ trunk/foray/foray-font/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-fotree/.checkstyle =================================================================== --- trunk/foray/foray-fotree/.checkstyle (rev 0) +++ trunk/foray/foray-fotree/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-fotree/.project =================================================================== --- trunk/foray/foray-fotree/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -68,11 +68,12 @@ protected void addSimplePageMaster(SimplePageMaster simplePageMaster) throws FOTreeException { // check against duplication of master-name - if (existsName(simplePageMaster.traitMasterName())) + if (existsName(simplePageMaster.traitMasterName())) { throwException("'master-name' (" + simplePageMaster.traitMasterName() + ") must be unique across page-masters and " + "page-sequence-masters"); + } this.simplePageMasters.put(simplePageMaster.traitMasterName(), simplePageMaster); } @@ -84,10 +85,11 @@ protected void addPageSequenceMaster(String masterName, PageSequenceMaster pageSequenceMaster) throws FOTreeException { // check against duplication of master-name - if (existsName(masterName)) + if (existsName(masterName)) { throwException("'master-name' (" + masterName + ") must be unique across page-masters and " + "page-sequence-masters"); + } this.pageSequenceMasters.put(masterName, pageSequenceMaster); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberGenerator.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberGenerator.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberGenerator.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -97,13 +97,15 @@ } } else if ((formatType == LOWERROMAN) || (formatType == UPPERROMAN)) { pn = makeRoman(number); - if (formatType == UPPERROMAN) + if (formatType == UPPERROMAN) { pn = pn.toUpperCase(); + } } else { // alphabetic pn = makeAlpha(number); - if (formatType == UPPERALPHA) + if (formatType == UPPERALPHA) { pn = pn.toUpperCase(); + } } return pn; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -178,8 +178,9 @@ * and throws an exception if this isn't the case. */ private final void expectRpar() throws PropertyException { - if (currentToken != TOK_RPAR) + if (currentToken != TOK_RPAR) { throw new PropertyException("expected )"); + } next(); } @@ -291,8 +292,9 @@ while (true) { prop = parseAdditiveExpr(); args.add(prop); - if (currentToken != TOK_COMMA) + if (currentToken != TOK_COMMA) { break; + } next(); } expectRpar(); @@ -416,8 +418,9 @@ } public void popFunction() { - if (stkFunction != null) + if (stkFunction != null) { stkFunction.pop(); + } } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -155,8 +155,9 @@ exprIndex++; scanDigits(); } - } else + } else { bSawDecimal = false; + } if (exprIndex < exprLength && expr.charAt(exprIndex) == '%') { exprIndex++; currentToken = TOK_PERCENT; @@ -212,8 +213,9 @@ default: --exprIndex; scanName(); - if (exprIndex == currentTokenStartIndex) + if (exprIndex == currentTokenStartIndex) { throw new PropertyException("illegal character"); + } currentTokenValue = expr.substring(currentTokenStartIndex, exprIndex); // if (currentMaybeOperator) { @@ -245,9 +247,11 @@ * Attempt to recognize a valid NAME token in the input expression. */ private void scanName() { - if (exprIndex < exprLength && isNameStartChar(expr.charAt(exprIndex))) + if (exprIndex < exprLength && isNameStartChar(expr.charAt(exprIndex))) { while (++exprIndex < exprLength - && isNameChar(expr.charAt(exprIndex))); + && isNameChar(expr.charAt(exprIndex))) { + } + } } /** @@ -255,8 +259,9 @@ * input expression. */ private void scanDigits() { - while (exprIndex < exprLength && isDigit(expr.charAt(exprIndex))) + while (exprIndex < exprLength && isDigit(expr.charAt(exprIndex))) { exprIndex++; + } } /** @@ -264,8 +269,9 @@ * input expression. */ private void scanHexDigits() { - while (exprIndex < exprLength && isHexDigit(expr.charAt(exprIndex))) + while (exprIndex < exprLength && isHexDigit(expr.charAt(exprIndex))) { exprIndex++; + } } /** Added: trunk/foray/foray-graphic/.checkstyle =================================================================== --- trunk/foray/foray-graphic/.checkstyle (rev 0) +++ trunk/foray/foray-graphic/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-mif/.checkstyle =================================================================== --- trunk/foray/foray-mif/.checkstyle (rev 0) +++ trunk/foray/foray-mif/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-mif/.project =================================================================== --- trunk/foray/foray-mif/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-mif/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java =================================================================== --- trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -942,111 +942,79 @@ } public void addToStream(String s) { - // Add this string to the curent flow - Para para = curFlow.curPara(); ParaLine paraLine = para.curParaLine(); paraLine.addContent(s); - } public void output(OutputStream stream) throws IOException { // Output the contents of bookComponent - this.bookComponent.output(stream); - } public void setDocumentHeightWidth(int height, int width) { - if (bookComponent.document == null) { - bookComponent.document = new Document(); bookComponent.document.height = height; bookComponent.document.width = width; } else if (bookComponent.document.height != height || bookComponent.document.width != width) { - logger.info("Warning: FrameMaker doesn't support different " + "page-sizes in a document."); } - } public void createTextRect(int numCols) { - // Create a textrect on the bodypage with these dimensions // This default behaviour will later be changed to reflect on // the master-page - - (bookComponent.curPage()).addTextRect(numCols); - // Then create a textflow corresponding to this textrect - curFlow = new TextFlow(); bookComponent.textFlows.add(curFlow); } public void setTextRectProp(int left, int top, int width, int height) { - (bookComponent.curPage()).curTextRect().setTextRectProp(left, top, width, height); - - } public void startLine() { - if (curFlow.curPara().curParaLine() != null) { this.addToStream("\n"); curFlow.curPara().startParaLine(); - } else + } else { curFlow.curPara().startParaLine(); - - + } } public void setBlockProp(int startIndent, int endIndent) { - - curFlow.startPara(); // Start a para curFlow.curPara().setBlockProp(startIndent, endIndent); - } public void createFrame(int x, int y, int w, int h) { - // Create a new anchored frame - bookComponent.createFrame(x, y, w, h); - } public void addImage(String url, int x, int y, int w, int h) { - Frame frame = bookComponent.createFrame(x, y, w, h); ImportObject imageObject = new ImportObject(url, 0, 0, w, h); frame.addContent(imageObject); if (curFlow.curPara().curParaLine() == null) { curFlow.curPara().startParaLine(); - } curFlow.curPara().curParaLine().addContent(frame); - - } public void createTable() { - // First create a table with an ID, then add it to the textflow - Tbl table = bookComponent.createTable(); if (curFlow.curPara().curParaLine() == null) { curFlow.curPara().startParaLine(); - } curFlow.curPara().curParaLine().addContent(table); @@ -1054,51 +1022,34 @@ * The above would have added the table to the textflow * But now the flow goes into the table, so ... */ - curFlow = table; - } public void setColumnProp(int colWidth) { - - // Get the current table - Tbl table = bookComponent.curTable(); table.addColumn(colWidth); - - } public void setCurrent(String current) { - // Start the table body or header or footer Tbl table = bookComponent.curTable(); table.setCurrent(current); - } public void startRow() { - Tbl table = bookComponent.curTable(); table.startRow(); - - } public void startCell(int rowSpan, int colSpan) { - Tbl table = bookComponent.curTable(); table.startCell(rowSpan, colSpan); - } public void endTable() { - // Switch the ref back to the current textflow - curFlow = bookComponent.curTextFlow(); - } } Added: trunk/foray/foray-output/.checkstyle =================================================================== --- trunk/foray/foray-output/.checkstyle (rev 0) +++ trunk/foray/foray-output/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-output/.project =================================================================== --- trunk/foray/foray-output/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-output/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Added: trunk/foray/foray-pdf/.checkstyle =================================================================== --- trunk/foray/foray-pdf/.checkstyle (rev 0) +++ trunk/foray/foray-pdf/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -1023,15 +1023,17 @@ protected void doDrawing(boolean fill, boolean stroke, boolean nonzero) { if (fill) { if (stroke) { - if (nonzero) + if (nonzero) { currentStream.write("B*\n"); - else + } else { currentStream.write("B\n"); + } } else { - if (nonzero) + if (nonzero) { currentStream.write("f*\n"); - else + } else { currentStream.write("f\n"); + } } } else { // if(stroke) Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -158,12 +158,19 @@ .TextAttribute.DX); Float dypos = (Float)aci.getAttribute(GVTAttributedCharacterIterator .TextAttribute.DY); - if (xpos != null) loc.setLocation(xpos.doubleValue(), loc.getY()); - if (ypos != null) loc.setLocation(loc.getX(), ypos.doubleValue()); - if (dxpos != null) loc.setLocation(loc.getX()+dxpos.doubleValue(), - loc.getY()); - if (dypos != null) loc.setLocation(loc.getX(), - loc.getY()+dypos.doubleValue()); + if (xpos != null) { + loc.setLocation(xpos.doubleValue(), loc.getY()); + } + if (ypos != null) { + loc.setLocation(loc.getX(), ypos.doubleValue()); + } + if (dxpos != null) { + loc.setLocation(loc.getX()+dxpos.doubleValue(), loc.getY()); + } + if (dypos != null) { + loc.setLocation(loc.getX(), loc.getY()+dypos.doubleValue()); + } + //Set up font Float taFontSize = (Float)aci.getAttribute(TextAttribute.SIZE); Added: trunk/foray/foray-pioneer/.checkstyle =================================================================== --- trunk/foray/foray-pioneer/.checkstyle (rev 0) +++ trunk/foray/foray-pioneer/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-pioneer/.project =================================================================== --- trunk/foray/foray-pioneer/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -47,8 +47,9 @@ if (rsi.isSpanned(i + 1)) { cells[i] = rsi.getSpanningCell(i + 1); states[i] = CELLSPAN; - } else + } else { states[i] = EMPTY; + } } } @@ -59,8 +60,9 @@ */ public int getNextFreeCell(int colNum) { for (int i = colNum - 1; i < states.length; i++) { - if (states[i] == EMPTY) + if (states[i] == EMPTY) { return i + 1; + } } return -1; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -108,8 +108,9 @@ */ public boolean hasUnfinishedSpans() { for (int i = 0; i < spanInfo.length; i++) { - if (spanInfo[i] != null) + if (spanInfo[i] != null) { return true; + } } return false; } @@ -125,8 +126,9 @@ */ public void finishRow(int rowHeight) { for (int i = 0; i < spanInfo.length; i++) { - if (spanInfo[i] != null && spanInfo[i].finishRow(rowHeight)) + if (spanInfo[i] != null && spanInfo[i].finishRow(rowHeight)) { spanInfo[i] = null; + } } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -172,10 +172,12 @@ setProgress(i); if (this.bodyCount == 0 && status == Status.AREA_FULL_NONE) { - if (node.getTableHeader() != null) + if (node.getTableHeader() != null) { tableHeaderPL.removeLayout(areaContainer); - if (node.getTableFooter() != null) + } + if (node.getTableFooter() != null) { tableFooterPL.removeLayout(areaContainer); + } resetProgress(); // status = new Status(Status.AREA_FULL_SOME); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -147,8 +147,9 @@ } setProgress(0); int breakStatus = layout.checkBreakBefore(node, area); - if (breakStatus != Status.OK) + if (breakStatus != Status.OK) { return breakStatus; + } } TableRowContainer areaContainer = new TableRowContainer(node, area); @@ -190,8 +191,9 @@ */ if (rowSpanMgr.isInLastRow(iColIndex)) { int h = rowSpanMgr.getRemainingHeight(iColIndex); - if (h > largestCellHeight) + if (h > largestCellHeight) { largestCellHeight = h; + } } offset += colWidth; continue; Added: trunk/foray/foray-pretty/.checkstyle =================================================================== --- trunk/foray/foray-pretty/.checkstyle (rev 0) +++ trunk/foray/foray-pretty/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-pretty/.project =================================================================== --- trunk/foray/foray-pretty/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pretty/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Added: trunk/foray/foray-ps/.checkstyle =================================================================== --- trunk/foray/foray-ps/.checkstyle (rev 0) +++ trunk/foray/foray-ps/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-render/.checkstyle =================================================================== --- trunk/foray/foray-render/.checkstyle (rev 0) +++ trunk/foray/foray-render/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-render/.project =================================================================== --- trunk/foray/foray-render/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -306,14 +306,18 @@ */ protected void renderRegions(PageArea page) { render(page.getRegionBody()); - if (page.getRegionBefore() != null) + if (page.getRegionBefore() != null) { render(page.getRegionBefore()); - if (page.getRegionAfter() != null) + } + if (page.getRegionAfter() != null) { render(page.getRegionAfter()); - if (page.getRegionStart() != null) + } + if (page.getRegionStart() != null) { render(page.getRegionStart()); - if (page.getRegionEnd() != null) + } + if (page.getRegionEnd() != null) { render(page.getRegionEnd()); + } } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -68,12 +68,14 @@ throws IOException { super.stopOutput(); - if(endNumber == -1) + if(endNumber == -1) { endNumber = getPageCount(); + } ArrayList numbers = getInvalidPageNumbers(); - for (int i = numbers.size() - 1; i > -1; i--) + for (int i = numbers.size() - 1; i > -1; i--) { removePage(Integer.parseInt((String)numbers.get(i))); + } try { printerJob.print(); @@ -100,14 +102,16 @@ if (i < startNumber || i > endNumber) { isValid = false; } else if (mode != EVEN_AND_ALL) { - if (mode == EVEN && ((i + 1) % 2 != 0)) + if (mode == EVEN && ((i + 1) % 2 != 0)) { isValid = false; - else if (mode == ODD && ((i + 1) % 2 != 1)) + } else if (mode == ODD && ((i + 1) % 2 != 1)) { isValid = false; + } } - if (!isValid) + if (!isValid) { vec.add(i + ""); + } } return vec; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -318,8 +318,12 @@ graphics.drawRect(startx, starty, endx - startx, endy - starty); } else { //don't round down to zero - if (w != 0 && endx == startx) endx++; - if (h != 0 && endy == starty) endy++; + if (w != 0 && endx == startx) { + endx++; + } + if (h != 0 && endy == starty) { + endy++; + } graphics.fillRect(startx, starty, endx - startx, endy - starty); } } @@ -376,8 +380,9 @@ } public void render(int aPageNumber) { - if(aPageNumber >= pageList.size()) + if(aPageNumber >= pageList.size()) { return; + } try { render((PageArea) pageList.get(aPageNumber)); @@ -624,7 +629,9 @@ boolean underline, boolean overline, boolean linethrough) { - if (!(underline || overline || linethrough)) return; + if (!(underline || overline || linethrough)) { + return; + } int newx = (x + 500) / 1000; int newy = pageHeight - (bl + 500) / 1000; @@ -633,8 +640,9 @@ LineMetrics lm = fm.getLineMetrics(text, graphics); int ulthick = (int)lm.getUnderlineThickness(); - if (ulthick < 1) + if (ulthick < 1) { ulthick = 1; // don't allow it to disappear + } if (underline) { // nothing in awt specifies underline location, // descent/2 seems to match my word processor @@ -648,8 +656,9 @@ } if (linethrough) { int ltthick = (int)lm.getStrikethroughThickness(); - if (ltthick < 1) + if (ltthick < 1) { ltthick = 1; // don't allow it to disappear + } int deltay = (int)lm.getStrikethroughOffset(); graphics.fillRect(newx, newy + deltay, width, ltthick); } @@ -751,8 +760,9 @@ public int print(Graphics g, PageFormat pageFormat, int pageIndex) throws PrinterException { - if (pageIndex >= pageList.size()) + if (pageIndex >= pageList.size()) { return NO_SUCH_PAGE; + } Graphics2D oldGraphics = graphics; @@ -776,8 +786,9 @@ public PageFormat getPageFormat(int pageIndex) throws IndexOutOfBoundsException { - if (pageIndex >= pageList.size()) + if (pageIndex >= pageList.size()) { return null; + } PageArea page = (PageArea)pageList.get(pageIndex); PageFormat pageFormat = new PageFormat(); Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -70,8 +70,9 @@ URL url = getClass().getResource(path); if (url == null) { getLogger().error("Icon not found: " + path); - } else + } else { putValue(SMALL_ICON, new ImageIcon(url)); + } } public void actionPerformed(ActionEvent e) { Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -76,8 +76,9 @@ private boolean isValid(String str) { - if (str == null) + if (str == null) { return false; + } if (str.length() > 0) { if (str.startsWith("#") || str.startsWith("!")) { return false; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -154,17 +154,22 @@ Object selectedValue = pane.getValue(); - if (selectedValue == null) + if (selectedValue == null) { return CLOSED_OPTION; + } - if (selectedValue.equals(OK_STRING)) + if (selectedValue.equals(OK_STRING)) { return JOptionPane.OK_OPTION; - if (selectedValue.equals(CANCEL_STRING)) + } + if (selectedValue.equals(CANCEL_STRING)) { return JOptionPane.CANCEL_OPTION; - if (selectedValue.equals(YES_STRING)) + } + if (selectedValue.equals(YES_STRING)) { return JOptionPane.YES_OPTION; - if (selectedValue.equals(NO_STRING)) + } + if (selectedValue.equals(NO_STRING)) { return JOptionPane.NO_OPTION; + } return CLOSED_OPTION; } @@ -211,20 +216,26 @@ Object selectedValue = pane.getValue(); - if (selectedValue == null) + if (selectedValue == null) { return CLOSED_OPTION; + } - if (((String)selectedValue).equals(DETAIL_OPTION)) + if (((String)selectedValue).equals(DETAIL_OPTION)) { return CLOSED_OPTION; + } - if (selectedValue.equals(OK_STRING)) + if (selectedValue.equals(OK_STRING)) { return JOptionPane.OK_OPTION; - if (selectedValue.equals(CANCEL_STRING)) + } + if (selectedValue.equals(CANCEL_STRING)) { return JOptionPane.CANCEL_OPTION; - if (selectedValue.equals(YES_STRING)) + } + if (selectedValue.equals(YES_STRING)) { return JOptionPane.YES_OPTION; - if (selectedValue.equals(NO_STRING)) + } + if (selectedValue.equals(NO_STRING)) { return JOptionPane.NO_OPTION; + } return CLOSED_OPTION; } @@ -255,10 +266,11 @@ // Zugriff public void setValue(Object aValue) { - if (aValue != null && DETAIL_OPTION.equals(aValue)) + if (aValue != null && DETAIL_OPTION.equals(aValue)) { displayDetails(getDialog()); - else + } else { super.setValue(aValue); + } } public String getDetailInformation() { Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -420,8 +420,9 @@ * Shows the previous page. */ private void goToPreviousPage(ActionEvent e) { - if (currentPage <= 0) + if (currentPage <= 0) { return; + } currentPage--; goToPage(currentPage); } @@ -430,8 +431,9 @@ * Shows the next page. */ private void goToNextPage(ActionEvent e) { - if (currentPage >= pageCount - 1) + if (currentPage >= pageCount - 1) { return; + } currentPage++; goToPage(currentPage); } @@ -440,8 +442,9 @@ * Shows the last page. */ private void goToLastPage(ActionEvent e) { - if (currentPage == pageCount - 1) + if (currentPage == pageCount - 1) { return; + } currentPage = pageCount - 1; goToPage(currentPage); } @@ -469,8 +472,9 @@ previewImageLabel.setIcon(null); statisticsStatus.setText(""); //Cleans up renderer - while (renderer.getPageCount() != 0) + while (renderer.getPageCount() != 0) { renderer.removePage(0); + } /* The following logic is almost certainly circular stack-inflating * logic, and is commented out until we have time to fix it. * TODO: This logic needs to be rewritten, probably as a loop that @@ -499,8 +503,9 @@ d.setVisible(true); currentPage = d.getPageNumber(); - if (currentPage < 1 || currentPage > pageCount) + if (currentPage < 1 || currentPage > pageCount) { return; + } currentPage--; @@ -511,8 +516,9 @@ * Shows the first page. */ private void goToFirstPage(ActionEvent e) { - if (currentPage == 0) + if (currentPage == 0) { return; + } currentPage = 0; goToPage(currentPage); } @@ -533,18 +539,19 @@ } public void setScale(double scaleFactor) { - if (scaleFactor == 25.0) + if (scaleFactor == 25.0) { scale.setSelectedIndex(0); - else if (scaleFactor == 50.0) + } else if (scaleFactor == 50.0) { scale.setSelectedIndex(1); - else if (scaleFactor == 75.0) + } else if (scaleFactor == 75.0) { scale.setSelectedIndex(2); - else if (scaleFactor == 100.0) + } else if (scaleFactor == 100.0) { scale.setSelectedIndex(3); - else if (scaleFactor == 150.0) + } else if (scaleFactor == 150.0) { scale.setSelectedIndex(4); - else if (scaleFactor == 200.0) + } else if (scaleFactor == 200.0) { scale.setSelectedIndex(5); + } renderer.setScaleFactor(scaleFactor); showPage(); @@ -601,8 +608,9 @@ if (isErrorMessage) { JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE); - } else + } else { processStatus.setText(message.toString()); + } } } @@ -611,8 +619,9 @@ if (SwingUtilities.isEventDispatchThread()) { viewer.run(); - } else + } else { SwingUtilities.invokeLater(viewer); + } } /** @@ -631,8 +640,9 @@ renderer.render(currentPage); pageImage = renderer.getLastRenderedPage(); - if (pageImage == null) + if (pageImage == null) { return; + } graphics = pageImage.getGraphics(); graphics.setColor(Color.black); graphics.drawRect(0, 0, pageImage.getWidth() - 1, Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -90,10 +90,9 @@ * */ public Object handleGetObject(String key) { - - if (key == null) + if (key == null) { return "Key is null"; - + } Object obj = lookup.get(key); if (obj != null) { return obj; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -154,8 +154,9 @@ + par); int index = rawText.indexOf(PARAMETER_TAG); String composedMess = ""; - if ((index == -1) && (par == null)) + if ((index == -1) && (par == null)) { return rawText; + } if ((index != -1) && (par == null)) { logger.info("Message " + actMessId + " erwartet Parameter. Aufgerufen ohne Parameter"); @@ -164,8 +165,9 @@ if ((index == -1) && (par != null)) { logger.info("Message " + actMessId + " erwartet keine Parameter. Aufgerufen mit folgenden Parametern:"); - for (int i = 0; i < par.length; ++i) + for (int i = 0; i < par.length; ++i) { logger.info(par[i].toString()); + } return rawText; } int tagCount = 0; @@ -184,9 +186,11 @@ tagCount++; } composedMess += rawText; - if (tagCount != par.length) + if (tagCount != par.length) { logger.info("Die zu der Meldung " + actMessId - + " übergebenen Parameter sind mehr als die Meldung vorsieht."); + + " übergebenen Parameter sind mehr als die Meldung " + + "vorsieht."); + } return composedMess; } @@ -224,24 +228,33 @@ int getValue(String fieldName) { int val = -1; - if (fieldName.equals("INFO")) + if (fieldName.equals("INFO")) { return INFO; - else if (fieldName.equals("WARNING")) + } + if (fieldName.equals("WARNING")) { return WARNING; - else if (fieldName.equals("ERROR")) + } + if (fieldName.equals("ERROR")) { return ERROR; - else if (fieldName.equals("SYS_ERROR")) + } + if (fieldName.equals("SYS_ERROR")) { return SYS_ERROR; - else if (fieldName.equals("QUESTION")) + } + if (fieldName.equals("QUESTION")) { return QUESTION; - else if (fieldName.equals("STYLE_NOBUTTON")) + } + if (fieldName.equals("STYLE_NOBUTTON")) { return STYLE_NOBUTTON; - else if (fieldName.equals("STYLE_Y")) + } + if (fieldName.equals("STYLE_Y")) { return STYLE_Y; - else if (fieldName.equals("STYLE_Y_N")) + } + if (fieldName.equals("STYLE_Y_N")) { return STYLE_Y_N; - else if (fieldName.equals("STYLE_Y_N_C")) + } + if (fieldName.equals("STYLE_Y_N_C")) { return STYLE_Y_N_C; + } return val; } Modified: trunk/foray/foray-render/src/java/org/foray/render... [truncated message content] |
|
From: <vic...@us...> - 2006-04-27 16:10:45
|
Revision: 7080 Author: victormote Date: 2006-04-27 09:10:38 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7080&view=rev Log Message: ----------- Turn most checks off for now. Modified Paths: -------------- trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/scripts/checkstyle-config.xml =================================================================== --- trunk/foray/scripts/checkstyle-config.xml 2006-04-27 15:58:06 UTC (rev 7079) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 16:10:38 UTC (rev 7080) @@ -2,10 +2,17 @@ <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> + +<!-- + This is the checkstyle configuration for FOray. + Any items marked with severity="ignore" document an unimplemented but + desired setting. +--> + <module name="Checker"> <module name="TreeWalker"> <module name="ModifierOrder"> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> </module> <module name="NeedBraces"> <property name="severity" value="error"/> @@ -13,26 +20,26 @@ LITERAL_FOR, LITERAL_WHILE"/> </module> <module name="AvoidStarImport"> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> </module> <module name="LineLength"> <property name="ignorePattern" value="^$"/> <property name="max" value="80"/> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> <property name="tabWidth" value="4"/> </module> <module name="EmptyForInitializerPad"> <property name="option" value="nospace"/> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> </module> <module name="ParenPad"> <property name="option" value="nospace"/> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/> </module> <module name="TabCharacter"> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> </module> </module> </module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 15:58:16
|
Revision: 7079 Author: victormote Date: 2006-04-27 08:58:06 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7079&view=rev Log Message: ----------- Conform to latest checkstyle config standards (AFAICT). Modified Paths: -------------- trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/scripts/checkstyle-config.xml =================================================================== --- trunk/foray/scripts/checkstyle-config.xml 2006-04-27 15:25:59 UTC (rev 7078) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 15:58:06 UTC (rev 7079) @@ -4,34 +4,34 @@ "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> <module name="Checker"> <module name="TreeWalker"> - <module name="ModifierOrderCheck"> + <module name="ModifierOrder"> <property name="severity" value="warning"/> </module> - <module name="NeedBracesCheck"> + <module name="NeedBraces"> <property name="severity" value="error"/> <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, LITERAL_FOR, LITERAL_WHILE"/> </module> - <module name="AvoidStarImportCheck"> + <module name="AvoidStarImport"> <property name="severity" value="warning"/> </module> - <module name="LineLengthCheck"> + <module name="LineLength"> <property name="ignorePattern" value="^$"/> <property name="max" value="80"/> <property name="severity" value="warning"/> <property name="tabWidth" value="4"/> </module> - <module name="EmptyForInitializerPadCheck"> + <module name="EmptyForInitializerPad"> <property name="option" value="nospace"/> <property name="severity" value="warning"/> </module> - <module name="ParenPadCheck"> + <module name="ParenPad"> <property name="option" value="nospace"/> <property name="severity" value="warning"/> <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/> </module> - <module name="TabCharacterCheck"> + <module name="TabCharacter"> <property name="severity" value="warning"/> </module> </module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |